Date: Thu, 5 Dec 2013 11:32:44 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258973 - user/pho/stress2/misc Message-ID: <201312051132.rB5BWiVf090067@svn.freebsd.org>
index | next in thread | raw e-mail
Author: pho Date: Thu Dec 5 11:32:44 2013 New Revision: 258973 URL: http://svnweb.freebsd.org/changeset/base/258973 Log: Limit run time, remove unneeded tunefs. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/suj10.sh user/pho/stress2/misc/suj25.sh user/pho/stress2/misc/suj4.sh Modified: user/pho/stress2/misc/suj10.sh ============================================================================== --- user/pho/stress2/misc/suj10.sh Thu Dec 5 11:29:07 2013 (r258972) +++ user/pho/stress2/misc/suj10.sh Thu Dec 5 11:32:44 2013 (r258973) @@ -66,8 +66,7 @@ mount | grep $mntpoint | grep -q /dev/md mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto -newfs -U md${mdstart}$part > /dev/null -tunefs -j enable /dev/md${mdstart}$part +newfs -j md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint @@ -114,7 +113,7 @@ test(void) pid_t pid; char file[128]; - for (i = 0; i < 10; i++) { + for (;;) { if (access("rendezvous", R_OK) == 0) break; sched_yield(); @@ -128,7 +127,7 @@ test(void) sprintf(file,"p%05d.%05d", pid, j); if ((fd = mkdir(file, 0740)) == -1) { if (errno != EINTR) { - warn("creat(%s). %s:%d", file, __FILE__, __LINE__); + warn("mkdir(%s). %s:%d", file, __FILE__, __LINE__); unlink("continue"); break; } Modified: user/pho/stress2/misc/suj25.sh ============================================================================== --- user/pho/stress2/misc/suj25.sh Thu Dec 5 11:29:07 2013 (r258972) +++ user/pho/stress2/misc/suj25.sh Thu Dec 5 11:32:44 2013 (r258973) @@ -43,7 +43,7 @@ mdconfig -l | grep -q md$mdstart && mdc mdconfig -a -t swap -s 2g -u $mdstart || exit 1 bsdlabel -w md$mdstart auto -newfs -U -j md${mdstart}$part > /dev/null 2>&1 +newfs -j md${mdstart}$part > /dev/null 2>&1 mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint @@ -58,6 +58,8 @@ sleep 2 while [ ! -s $mntpoint/.snap/suj25 ]; do rm -f $mntpoint/.snap/suj25 mksnap_ffs $mntpoint $mntpoint/.snap/suj25 + n=$((n + 1)) + [ $n -gt 5 ] && break done wait Modified: user/pho/stress2/misc/suj4.sh ============================================================================== --- user/pho/stress2/misc/suj4.sh Thu Dec 5 11:29:07 2013 (r258972) +++ user/pho/stress2/misc/suj4.sh Thu Dec 5 11:32:44 2013 (r258973) @@ -38,13 +38,12 @@ mount | grep $mntpoint | grep -q /dev/md mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart bsdlabel -w md$mdstart auto -newfs -U md${mdstart}$part > /dev/null -tunefs -j enable /dev/md${mdstart}$part +newfs -j md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint export RUNDIR=$mntpoint/stressX -export runRUNTIME=1h +export runRUNTIME=30m set `df -ik /mnt | tail -1 | awk '{print $4,$7}'` export KBLOCKS=$(($1 / 2)) export INODES=$(($2 / 2))help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312051132.rB5BWiVf090067>