From owner-svn-src-user@freebsd.org Wed Mar 13 09:33:16 2019 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3AAE152C828 for ; Wed, 13 Mar 2019 09:33:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 368276FA91; Wed, 13 Mar 2019 09:33:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 287788913; Wed, 13 Mar 2019 09:33:16 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2D9XGtA089243; Wed, 13 Mar 2019 09:33:16 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2D9XGHV089242; Wed, 13 Mar 2019 09:33:16 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201903130933.x2D9XGHV089242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 13 Mar 2019 09:33:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r345084 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 345084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 368276FA91 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Mar 2019 09:33:16 -0000 Author: pho Date: Wed Mar 13 09:33:15 2019 New Revision: 345084 URL: https://svnweb.freebsd.org/changeset/base/345084 Log: Limit wait time for mirror COMPLETE state. Check /var/log/messages for "check-hash" messages. Added fsck check. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/graid1_7.sh Modified: user/pho/stress2/misc/graid1_7.sh ============================================================================== --- user/pho/stress2/misc/graid1_7.sh Wed Mar 13 06:46:15 2019 (r345083) +++ user/pho/stress2/misc/graid1_7.sh Wed Mar 13 09:33:15 2019 (r345084) @@ -74,6 +74,8 @@ rm -rf /tmp/stressX.control su $testuser -c 'cd ..; ./run.sh io.cfg' > /dev/null 2>&1 & pid=$! +last=`tail -1 /var/log/messages | cut -c1-15` +[ -z "$last" ] && last=dummy sleep 2 cont=/tmp/graid1_7.cont touch $cont @@ -96,18 +98,28 @@ rm $cont wait gmirror status test | grep -qw md${u1}p2 || gmirror insert test md${u1}p2 gmirror status test | grep -qw md${u1}p3 || gmirror insert test md${u1}p3 -while ! gmirror status test | grep -q COMPLETE; do sleep 5; done +i=0 +while ! gmirror status test | grep -q COMPLETE; do + sleep 5 + if [ $((i += 1)) -gt 20 ]; then + echo "FAIL to COMPLETE" + s=1 + break + fi +done while mount | grep $mntpoint | grep -q /mirror/; do umount $mntpoint || sleep 5 done +checkfs /dev/mirror/test || s=2 while gmirror status test | grep -q SYNCHRONIZING; do sleep 10; done for i in `jot 10`; do gmirror stop test && break || sleep 30 done -[ $i -eq 10 ] && s=1 +[ $i -eq 10 ] && s=3 gmirror destroy test 2>/dev/null [ $unload ] && gmirror unload -mdconfig -d -u $mdstart || s=3 +mdconfig -d -u $mdstart || s=4 +sed "1,/$last/d" < /var/log/messages | tail -20 | grep -m 1 "check-hash" && s=5 exit $s