Date: Mon, 25 Sep 2017 11:38:58 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r323984 - user/pho/stress2/misc Message-ID: <201709251138.v8PBcw2e016597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Mon Sep 25 11:38:58 2017 New Revision: 323984 URL: https://svnweb.freebsd.org/changeset/base/323984 Log: Return fsck(1) status. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/trim.sh user/pho/stress2/misc/trim2.sh user/pho/stress2/misc/trim3.sh Modified: user/pho/stress2/misc/trim.sh ============================================================================== --- user/pho/stress2/misc/trim.sh Mon Sep 25 02:06:51 2017 (r323983) +++ user/pho/stress2/misc/trim.sh Mon Sep 25 11:38:58 2017 (r323984) @@ -64,9 +64,8 @@ for flag in ' ' $opt; do umount $mntpoint && break || sleep 10 done [ $i -eq 6 ] && { s=1; break; } - checkfs /dev/md${mdstart}$part + checkfs /dev/md${mdstart}$part || s=1 mdconfig -d -u $mdstart done -rm -f /tmp/fsck.log [ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=$malloc_wait exit $s Modified: user/pho/stress2/misc/trim2.sh ============================================================================== --- user/pho/stress2/misc/trim2.sh Mon Sep 25 02:06:51 2017 (r323983) +++ user/pho/stress2/misc/trim2.sh Mon Sep 25 11:38:58 2017 (r323984) @@ -54,10 +54,8 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done -grep -a -qm1 Trim /dev/md${mdstart}$part && echo "Test failed" +grep -a -qm1 Trim /dev/md${mdstart}$part && { echo "Test failed"; s=1; } -fsck -t ufs -y /dev/md${mdstart}$part 2>&1 | tee /tmp/fsck.log | \ - grep -v "IS CLEAN" | egrep -q -m1 "[A-Z][A-Z]" && \ - cat /tmp/fsck.log +checkfs /dev/md${mdstart}$part; s=$? mdconfig -d -u $mdstart -rm -f /tmp/fsck.log +exit $s Modified: user/pho/stress2/misc/trim3.sh ============================================================================== --- user/pho/stress2/misc/trim3.sh Mon Sep 25 02:06:51 2017 (r323983) +++ user/pho/stress2/misc/trim3.sh Mon Sep 25 11:38:58 2017 (r323984) @@ -62,6 +62,7 @@ for flag in ' ' $opt; do while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 done - checkfs /dev/md${mdstart}$part + checkfs /dev/md${mdstart}$part; s=$? mdconfig -d -u $mdstart done +exit $s
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709251138.v8PBcw2e016597>