From d76e65bcd3b545a0cd03f4851aa46a2e769eb2e8 Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Fri, 9 Apr 2021 15:37:24 -0400 Subject: [PATCH] rgw: test `radosgw-admin radoslist` and incomplete multiparts better Make sure there are more than 1000 incomplete multiparts and also make sure one of the incomplete multiparts has at least 1000 parts. This test is done indirectly through rgw-orphan-list, which invokes `radosgw-admin radoslist`. Also, clean up shell flags, so script output is less verbose. Signed-off-by: J. Eric Ivancich --- qa/workunits/rgw/test_rgw_orphan_list.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/qa/workunits/rgw/test_rgw_orphan_list.sh b/qa/workunits/rgw/test_rgw_orphan_list.sh index 4299078a173dd..34d550ceade67 100755 --- a/qa/workunits/rgw/test_rgw_orphan_list.sh +++ b/qa/workunits/rgw/test_rgw_orphan_list.sh @@ -1,12 +1,13 @@ #!/usr/bin/env bash -set -ex +# set -x +set -e # if defined, debug messages will be displayed and prepended with the string # debug="DEBUG" -huge_size=2222 # in megabytes -big_size=6 # in megabytes +huge_size=5100 # in megabytes +big_size=7 # in megabytes huge_obj=/tmp/huge_obj.temp.$$ big_obj=/tmp/big_obj.temp.$$ @@ -160,7 +161,6 @@ mys3uploadkill() { exit 1 fi - set -v local_file="$1" remote_bkt="$2" remote_obj="$3" @@ -229,8 +229,16 @@ mys3cmd ls s3://multipart-bkt bkt="incomplete-mp-bkt-1" mys3cmd mb s3://$bkt -mys3uploadkill $huge_obj $bkt incomplete-mp-obj-1 $fifo 20 -mys3uploadkill $huge_obj $bkt incomplete-mp-obj-2 $fifo 100 + +mys3uploadkill $huge_obj $bkt incomplete-mp-obj-c $fifo 20 + +# generate an incomplete multipart with more than 1,000 parts +mys3uploadkill $huge_obj $bkt incomplete-mp-obj-b $fifo 1005 + +# generate more than 1000 incomplet multiparts +for c in $(seq 1005) ;do + mys3uploadkill $huge_obj $bkt incomplete-mp-obj-c-$c $fifo 3 +done #################################### # resharded bucket -- 2.39.5