From nobody Tue Mar 15 08:36:20 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 04E551A08CBF; Tue, 15 Mar 2022 08:36:21 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KHmw46knjz4cJd; Tue, 15 Mar 2022 08:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647333381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zd5wm/AdLr2wSzch/3pruotM4OtwOJ3Nq6FSTMMn51c=; b=MF5peDXXY/0ELTQZE8FWI/Luy5IPQxWitkLQ9S+f5vn9gLzwWuHWOYYN2sbQp0DNVRI53C Hmou0fEV+JYBXmbl+LtdLvsyyx9A93vqj4GBbR+sSOfHi9dCI1Dph25UIsk+3vnirh9a+q vq9yp4xpzrUmHBj9qaiRSfGiABFfaniypE+Atpbq+yNrMf3GFKg7zopIe6F3DALcqO5bMf wxrmNA90Nkh+WtZ7PeSUvJXnyaECwiZlJREO/bpwCGnFCGxcx9RZTFDX9Zu1j0dcnoj/NQ mR3yJO4VU5HBQgsPk0k2ba8RIeA57EVpA2aoPA3htEka1ltdwMExrCn9xujGJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C789A1E8E0; Tue, 15 Mar 2022 08:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22F8aKOD090762; Tue, 15 Mar 2022 08:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22F8aKCa090761; Tue, 15 Mar 2022 08:36:20 GMT (envelope-from git) Date: Tue, 15 Mar 2022 08:36:20 GMT Message-Id: <202203150836.22F8aKCa090761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 9e8fbb95b36f - main - stress2: A unmount of a unionfs file system may return EBUSY. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e8fbb95b36f14cdcba8aaace0523811a8eef3ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647333381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zd5wm/AdLr2wSzch/3pruotM4OtwOJ3Nq6FSTMMn51c=; b=Oy8JhNReFYJvtF2zeK+iRa6f4k0Sz8m/BNCLHRWv0Srx1+mQBFoIubGtgIf7r7Uq15PJzm wqG7WVYYQeNs3wGBF/g/6dySy+nw/GmtPJeUYGdcaBKZbDYC8o5AKvZ8/cGj+pJpliAaTh TW4wTe1Z0zBhIMEJH16Fr2ehjvRTLw2hDEt7iQ3Y3Q1aAOLwkGttNaQQkRLdDDUTpBkN/5 yx36hIlGV9d5UWUdVOa8DKCWM+2g2TvGaOAE0fkDAvGyZ+99nH11e6t/Kc8tbEkCgC4fG2 VIV+rQNniLAf2qB7RtSffH1YrTu8uuXCX28YbY+QVj6BffihglYhxH89cmm+hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647333381; a=rsa-sha256; cv=none; b=jGPvGCJdOIWxX6Zd4uO0aWmr6THATi2NGa32W5074vOdIG6kng1qNaANJD7XPb/hOxyW4d b6b7Al6X2b8GM2Fwuh4btnUXGbJDeH2S+TPnShEo43GLNe+cOGakc1i7RGLFHbZrOcEUbY Q78gf913WmyXKy0gdKJkeRf2OfjmQt9kyp5F5tuyWykN2GOFq7SNaNkDqt8dDNWFonoPvC s33vhbwudhJIZO5ksheJN3wotjasvEPGslWzoBWNAiazDRlfvK1gJTPHtPiVjk42fT+Ri2 QtNadZzW0S9xEb08BlVJN4SqxA8u5pHVQE4zlGkExaFuPIxvb3EMEg24KmeJ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8fbb95b36f14cdcba8aaace0523811a8eef3ec commit 9e8fbb95b36f14cdcba8aaace0523811a8eef3ec Author: Peter Holm AuthorDate: 2022-03-15 08:35:22 +0000 Commit: Peter Holm CommitDate: 2022-03-15 08:35:22 +0000 stress2: A unmount of a unionfs file system may return EBUSY. --- tools/test/stress2/misc/unionfs13.sh | 5 ++++- tools/test/stress2/misc/unionfs4.sh | 5 ++++- tools/test/stress2/misc/unionfs5.sh | 7 +++++-- tools/test/stress2/misc/unionfs6.sh | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/unionfs13.sh b/tools/test/stress2/misc/unionfs13.sh index 69690d91e7d3..9c2d57425053 100755 --- a/tools/test/stress2/misc/unionfs13.sh +++ b/tools/test/stress2/misc/unionfs13.sh @@ -64,7 +64,10 @@ done [ $s ] && echo "Failed in loop #$i" df -i $mp2 | tail -1 -umount $mp2 # The unionfs mount +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done umount $mp2 umount $mp1 mdconfig -d -u $md2 diff --git a/tools/test/stress2/misc/unionfs4.sh b/tools/test/stress2/misc/unionfs4.sh index 557cead66389..2355005c1f8b 100755 --- a/tools/test/stress2/misc/unionfs4.sh +++ b/tools/test/stress2/misc/unionfs4.sh @@ -67,7 +67,10 @@ export runRUNTIME=2m (cd ..; ./run.sh marcus.cfg) ../tools/killall.sh -umount $mp2 # The unionfs mount +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done umount $mp2 n=`find $mp1/stressX | wc -l` [ $n -eq 1 ] && s=0 || { find $mp1/stressX -ls | head -12; s=1; } diff --git a/tools/test/stress2/misc/unionfs5.sh b/tools/test/stress2/misc/unionfs5.sh index ba00fa2b5258..5e12ffbf5abd 100755 --- a/tools/test/stress2/misc/unionfs5.sh +++ b/tools/test/stress2/misc/unionfs5.sh @@ -72,8 +72,11 @@ export runRUNTIME=2m (cd ../testcases/mkdir; ./mkdir -t 2m -i 20) -find $RUNDIR -ls -umount $mp2 # The unionfs mount +find $RUNDIR -ls | head -5 +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done umount $mp2 n=`find $mp1/stressX | wc -l` [ $n -eq 1 ] && s=0 || s=1 diff --git a/tools/test/stress2/misc/unionfs6.sh b/tools/test/stress2/misc/unionfs6.sh index 21620f3f39b6..7291a6f61fd8 100755 --- a/tools/test/stress2/misc/unionfs6.sh +++ b/tools/test/stress2/misc/unionfs6.sh @@ -87,7 +87,10 @@ chmod 777 $mp2 su $testuser -c \ '(cd ..; ./testcases/run/run $TESTPROGS)' -umount $mp2 # The unionfs mount +while mount | grep -Eq "on $mp2 .*unionfs"; do + umount $mp2 && break + sleep 5 +done umount $mp2 n=`find $mp1/stressX | wc -l` [ $n -eq 1 ] && s=0 || { find $mp1/stressX -ls | head -12; s=1; }