Skip to content

Commit

Permalink
qa/workunits: merge_diff shouldn't attempt to use striping v2
Browse files Browse the repository at this point in the history
Fixes: ceph#14165
Signed-off-by: Jason Dillaman <[email protected]>
  • Loading branch information
Jason Dillaman committed Dec 23, 2015
1 parent 0c17b61 commit 8e095de
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion qa/workunits/rbd/merge_diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e095de

Please sign in to comment.