qa/workunits: merge_diff shouldn't attempt to use striping v2

Fixes: #14165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/qa/workunits/rbd/merge_diff.sh b/qa/workunits/rbd/merge_diff.sh
index 87486066b07951f71ff755cfd076410229722c60..0b6643dfa54762b8d2e500d224a6c231bcfc3eca 100755 (executable)
--- a/qa/workunits/rbd/merge_diff.sh
+++ b/qa/workunits/rbd/merge_diff.sh
@@ -30,7 +30,11 @@ function rebuild()
   clear_all
   echo Starting test $testno
   ((testno++))
-  rbd create $gen --size 100 --object-size $1 --stripe-unit $2 --stripe-count $3 --image-format $4
+  if [[ "$2" -lt "$1" ]] && [[ "$3" -gt "1" ]]; then
+    rbd create $gen --size 100 --object-size $1 --stripe-unit $2 --stripe-count $3 --image-format $4
+  else
+    rbd create $gen --size 100 --object-size $1 --image-format $4
+  fi
   rbd create $out --size 1 --object-size 524288
   mkdir -p mnt diffs
   # lttng has atexit handlers that need to be fork/clone aware