Skip to contentSkip to conversation

generic/648: dmerror must be unmounted

PATCH In review Zorro Lang 4 participants 5 messages Oct 24, 2021 – Nov 14, 2021

lore
Share & tools
lore

Zorro Lang

author
#0 lore raw

PATCH v2 1/1 generic/648: dmerror must be unmounted

Sometimes g/648 fail to unmount dmerror with this error:

umount: /mnt/xfstests/scratch: target is busy.

Even worse, it will cause all later test cases fail as:

mount: bad usage
Try 'mount --help' for more information.
check: failed to mount $SCRATCH_DEV using specified options Interrupted!

So we shouldn't _fail directly if dmerror_unmount fails, use a while loop to try to unmount it enough times.

---

As Darrick's review point, V2 brings the "iteration XXX scratch unmount failed" _fail back.

Thanks,
Zorro

 tests/generic/648 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
tests/generic/648 +16 -2
index 83dd111d..e5c743c5 100755
@@ -104,7 +104,7 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 		wait > /dev/null 2>&1
 		ps -e | grep fsstress > /dev/null 2>&1
 	done
-	for ((i = 0; i < 10; i++)); do
+	for ((j = 0; j < 10; j++)); do
 		test -e "$snap_aliveflag" || break
 		sleep 1
 	done
@@ -112,7 +112,21 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 	# Mount again to replay log after loading working table, so we have a
 	# consistent fs after test.
 	$UMOUNT_PROG $loopmnt
-	_dmerror_unmount || _fail "iteration $i scratch unmount failed"
+	is_unmounted=1
+	# We must unmount dmerror at here, or whole later testing will crash.
+	# So try to umount enough times, before we have no choice.
+	for ((j = 0; j < 100; j++)); do
+		sleep 1
+		_dmerror_unmount > $tmp.unmount.err 2>&1
+		if [ $? -eq 0 ];then
+			is_unmounted=0
+			break
+		fi
+	done
+	if [ $is_unmounted -ne 0 ];then
+		cat $tmp.unmount.err
+		_fail "iteration $i scratch unmount failed"
+	fi
 	_dmerror_load_working_table
 	if ! _dmerror_mount; then
 		_metadump_dev $DMERROR_DEV $seqres.scratch.$i.md
Signature · 1 line
2.31.1
author
#1 lore raw
Quoted 11 lines · Zorro Lang

Sometimes g/648 fail to unmount dmerror with this error:

umount: /mnt/xfstests/scratch: target is busy.

Even worse, it will cause all later test cases fail as:

mount: bad usage
Try 'mount --help' for more information.
check: failed to mount $SCRATCH_DEV using specified options Interrupted!

Quoted 5 lines

So we shouldn't _fail directly if dmerror_unmount fails, use a while loop to try to unmount it enough times.

---

Ping, it's been 2+ weeks passed, any more review points about this?

Thanks,
Zorro

Quoted 49 lines

As Darrick's review point, V2 brings the "iteration XXX scratch unmount failed" _fail back.

Thanks,
Zorro

 tests/generic/648 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
tests/generic/648 +16 -2
index 83dd111d..e5c743c5 100755
@@ -104,7 +104,7 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 		wait > /dev/null 2>&1
 		ps -e | grep fsstress > /dev/null 2>&1
 	done
-	for ((i = 0; i < 10; i++)); do
+	for ((j = 0; j < 10; j++)); do
 		test -e "$snap_aliveflag" || break
 		sleep 1
 	done
@@ -112,7 +112,21 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 	# Mount again to replay log after loading working table, so we have a
 	# consistent fs after test.
 	$UMOUNT_PROG $loopmnt
-	_dmerror_unmount || _fail "iteration $i scratch unmount failed"
+	is_unmounted=1
+	# We must unmount dmerror at here, or whole later testing will crash.
+	# So try to umount enough times, before we have no choice.
+	for ((j = 0; j < 100; j++)); do
+		sleep 1
+		_dmerror_unmount > $tmp.unmount.err 2>&1
+		if [ $? -eq 0 ];then
+			is_unmounted=0
+			break
+		fi
+	done
+	if [ $is_unmounted -ne 0 ];then
+		cat $tmp.unmount.err
+		_fail "iteration $i scratch unmount failed"
+	fi
 	_dmerror_load_working_table
 	if ! _dmerror_mount; then
 		_metadump_dev $DMERROR_DEV $seqres.scratch.$i.md
Signature · 1 line
2.31.1
#2 lore raw
Quoted 12 lines · Zorro Lang
Quoted 11 lines · Zorro Lang

Sometimes g/648 fail to unmount dmerror with this error:

umount: /mnt/xfstests/scratch: target is busy.

Even worse, it will cause all later test cases fail as:

mount: bad usage
Try 'mount --help' for more information.
check: failed to mount $SCRATCH_DEV using specified options Interrupted!

Quoted 7 lines
Quoted 5 lines

So we shouldn't _fail directly if dmerror_unmount fails, use a while loop to try to unmount it enough times.

---

Ping, it's been 2+ weeks passed, any more review points about this?

Sorry, I lost it in my to-review queue.. Applied now.

Thanks,
Eryu

#3 lore raw
In reply to Zorro Lang
Quoted 6 lines · Zorro Lang

Sometimes g/648 fail to unmount dmerror with this error:

umount: /mnt/xfstests/scratch: target is busy.

Even worse, it will cause all later test cases fail as:

Quoted 7 lines

mount: bad usage
Try 'mount --help' for more information.
check: failed to mount $SCRATCH_DEV using specified options Interrupted!

So we shouldn't _fail directly if dmerror_unmount fails, use a while loop to try to unmount it enough times.

I also met EBUSY error when testing other cases(I need to filter about 60 cases for this reason and do signle test for them) that using dmerror or dmflakey.

Can we add a umount_api for dmerror/dmflakey that use a while loop to umount during enough time in xfstest layer?

Best Regards
Yang Xu

Quoted 49 lines

---

As Darrick's review point, V2 brings the "iteration XXX scratch unmount failed" _fail back.

Thanks,
Zorro

  tests/generic/648 | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
tests/generic/648 +16 -2
index 83dd111d..e5c743c5 100755
@@ -104,7 +104,7 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
  		wait>  /dev/null 2>&1
  		ps -e | grep fsstress>  /dev/null 2>&1
  	done
-	for ((i = 0; i<  10; i++)); do
+	for ((j = 0; j<  10; j++)); do
  		test -e "$snap_aliveflag" || break
  		sleep 1
  	done
@@ -112,7 +112,21 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
  	# Mount again to replay log after loading working table, so we have a
  	# consistent fs after test.
  	$UMOUNT_PROG $loopmnt
-	_dmerror_unmount || _fail "iteration $i scratch unmount failed"
+	is_unmounted=1
+	# We must unmount dmerror at here, or whole later testing will crash.
+	# So try to umount enough times, before we have no choice.
+	for ((j = 0; j<  100; j++)); do
+		sleep 1
+		_dmerror_unmount>  $tmp.unmount.err 2>&1
+		if [ $? -eq 0 ];then
+			is_unmounted=0
+			break
+		fi
+	done
+	if [ $is_unmounted -ne 0 ];then
+		cat $tmp.unmount.err
+		_fail "iteration $i scratch unmount failed"
+	fi
  	_dmerror_load_working_table
  	if ! _dmerror_mount; then
  		_metadump_dev $DMERROR_DEV $seqres.scratch.$i.md
Reviewed-by on v2 1/1
#4 lore raw
In reply to Zorro Lang
Quoted 11 lines · Zorro Lang

Sometimes g/648 fail to unmount dmerror with this error:

umount: /mnt/xfstests/scratch: target is busy.

Even worse, it will cause all later test cases fail as:

mount: bad usage
Try 'mount --help' for more information.
check: failed to mount $SCRATCH_DEV using specified options Interrupted!

Quoted 4 lines

So we shouldn't _fail directly if dmerror_unmount fails, use a while loop to try to unmount it enough times.

Looks good to me now,

--D

Quoted 50 lines

---

As Darrick's review point, V2 brings the "iteration XXX scratch unmount failed" _fail back.

Thanks,
Zorro

 tests/generic/648 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
tests/generic/648 +16 -2
index 83dd111d..e5c743c5 100755
@@ -104,7 +104,7 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 		wait > /dev/null 2>&1
 		ps -e | grep fsstress > /dev/null 2>&1
 	done
-	for ((i = 0; i < 10; i++)); do
+	for ((j = 0; j < 10; j++)); do
 		test -e "$snap_aliveflag" || break
 		sleep 1
 	done
@@ -112,7 +112,21 @@ for i in $(seq 1 $((25 * TIME_FACTOR)) ); do
 	# Mount again to replay log after loading working table, so we have a
 	# consistent fs after test.
 	$UMOUNT_PROG $loopmnt
-	_dmerror_unmount || _fail "iteration $i scratch unmount failed"
+	is_unmounted=1
+	# We must unmount dmerror at here, or whole later testing will crash.
+	# So try to umount enough times, before we have no choice.
+	for ((j = 0; j < 100; j++)); do
+		sleep 1
+		_dmerror_unmount > $tmp.unmount.err 2>&1
+		if [ $? -eq 0 ];then
+			is_unmounted=0
+			break
+		fi
+	done
+	if [ $is_unmounted -ne 0 ];then
+		cat $tmp.unmount.err
+		_fail "iteration $i scratch unmount failed"
+	fi
 	_dmerror_load_working_table
 	if ! _dmerror_mount; then
 		_metadump_dev $DMERROR_DEV $seqres.scratch.$i.md
Signature · 1 line
2.31.1