Date: Thu, 29 Dec 2011 12:33:42 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r228954 - projects/stress2/misc Message-ID: <201112291233.pBTCXgsX056304@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Thu Dec 29 12:33:41 2011 New Revision: 228954 URL: http://svn.freebsd.org/changeset/base/228954 Log: Use the global configuration file and limit runtime to 30 minutes. Modified: projects/stress2/misc/snap5-1.sh Modified: projects/stress2/misc/snap5-1.sh ============================================================================== --- projects/stress2/misc/snap5-1.sh Thu Dec 29 12:33:27 2011 (r228953) +++ projects/stress2/misc/snap5-1.sh Thu Dec 29 12:33:41 2011 (r228954) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org> +# Copyright (c) 2008, 2011 Peter Holm <pho@FreeBSD.org> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -30,26 +30,30 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 -[ ! -d /mnt2 ] && mkdir /mnt2 +. ../default.cfg + +mnt2=${mntpoint}2 +[ ! -d $mnt2 ] && mkdir $mnt2 trap "rm -f /tmp/.snap/pho" 0 -for i in `jot 64`; do - if mount | grep -q "/dev/md0 on /mnt2"; then - umount /mnt2 || exit 2 +start=`date '+%s'` +while [ `date '+%s'` -lt $((start + 1800)) ]; do + if mount | grep -q "/dev/md$mdstart on $mnt2"; then + umount $mnt2 || exit 2 fi - if mdconfig -l | grep -q md0; then - mdconfig -d -u 0 || exit 3 + if mdconfig -l | grep -q md$mdstart; then + mdconfig -d -u $mdstart || exit 3 fi rm -f /tmp/.snap/pho date '+%T' mksnap_ffs /tmp /tmp/.snap/pho || continue - mdconfig -a -t vnode -f /tmp/.snap/pho -u 0 -o readonly || exit 4 - mount -o ro /dev/md0 /mnt2 || exit 5 + mdconfig -a -t vnode -f /tmp/.snap/pho -u $mdstart -o readonly || exit 4 + mount -o ro /dev/md$mdstart $mnt2 || exit 5 - ls -l /mnt2 > /dev/null + ls -l $mnt2 > /dev/null r=`head -c4 /dev/urandom | od -N2 -tu4 | sed -ne '1s/ *$//;1s/.* //p'` sleep $(( r % 120 )) done -mount | grep -q "/dev/md0 on /mnt2" && umount /mnt2 -mdconfig -l | grep -q md0 && mdconfig -d -u 0 +mount | grep -q "/dev/md$mdstart on $mnt2" && umount $mnt2 +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112291233.pBTCXgsX056304>