qa: small improvements to merge-diff test

* Use set -e to detect errors
* no need to retry cleanup in a loop now that rbd-fuse closes images
* use --no-progress for long-running operations
* add output at the start of each test

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/qa/workunits/rbd/merge_diff.sh b/qa/workunits/rbd/merge_diff.sh
index abb8587385f7768b82a0cba499798bb00bbde3e1..9f84d59302c50d1e48d5a4aee5c468a6de136f41 100755 (executable)
--- a/qa/workunits/rbd/merge_diff.sh
+++ b/qa/workunits/rbd/merge_diff.sh
@@ -1,10 +1,9 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 pool=rbd
 gen=$pool/gen
 out=$pool/out
-
-set -x
+testno=1
 
 mkdir -p merge_diff_test
 pushd merge_diff_test
@@ -16,27 +15,21 @@ function expect_false()
 
 function clear_all()
 {
-  umount mnt || true
-  while [ 1 ];
-  do
-    rbd snap purge $gen 2>/dev/null >/dev/null
-    rbd rm $gen 2>/dev/null >/dev/null
-    rbd snap purge $out 2>/dev/null >/dev/null
-    rbd rm $out 2>/dev/null >/dev/null
-
-    sleep 5
-
-    rbd info $gen 2>/dev/null >/dev/null && continue
-    rbd info $out 2>/dev/null >/dev/null && continue
-
-    break
-  done
-  rm -rf diffs
+  fusermount -u mnt || true
+
+  rbd snap purge --no-progress $gen || true
+  rbd rm --no-progress $gen || true
+  rbd snap purge --no-progress $out || true
+  rbd rm --no-progress $out || true
+
+  rm -rf diffs || true
 }
 
 function rebuild()
 {
   clear_all
+  echo Starting test $testno
+  ((testno++))
   rbd create $gen --size 100 --order $1 --stripe_unit $2 --stripe_count $3 --image-format $4
   rbd create $out --size 1 --order 19
   mkdir -p mnt diffs
@@ -55,7 +48,7 @@ function snap()
 
 function resize()
 {
-  rbd resize $gen --size $1 --allow-shrink
+  rbd resize --no-progress $gen --size $1 --allow-shrink
 }
 
 function export_diff()
@@ -66,9 +59,9 @@ function export_diff()
     target="$gen@$2"
   fi
   if [ $1 == "null" ]; then
-    rbd export-diff $target diffs/$1.$2
+    rbd export-diff --no-progress $target diffs/$1.$2
   else
-    rbd export-diff $target --from-snap $1 diffs/$1.$2
+    rbd export-diff --no-progress $target --from-snap $1 diffs/$1.$2
   fi
 }
 
@@ -79,7 +72,7 @@ function merge_diff()
 
 function check()
 {
-  rbd import-diff diffs/$1.$2 $out || return -1
+  rbd import-diff --no-progress diffs/$1.$2 $out || return -1
   if [ "$2" == "head" ]; then
     sum1=`rbd export $gen - | md5sum`
   else
@@ -472,4 +465,4 @@ clear_all
 popd
 rm -rf merge_diff_test
 
-exit 0
+echo OK