From 45189283109a097e929e1a3a1d10edfbf2aab643 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Mon, 1 May 2023 18:05:35 +0300 Subject: [PATCH] LU-16788 tests: sanity should remove temp files during the test to fit OSTSIZE Test-Parameters: trivial Signed-off-by: Alex Zhuravlev Change-Id: I2f1cfe0511061794d81d0349cf36a50f40470553 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50819 Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity.sh | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 623fee7..44f4123 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -7396,6 +7396,7 @@ test_56wa() { local dir=$DIR/$tdir setup_56 $dir $NUMFILES $NUMDIRS "-c $OSTCOUNT" "-c1" + stack_trap "rm -rf $dir" local stripe_size=$($LFS getstripe -S -d $dir) || error "$LFS getstripe -S -d $dir failed" @@ -8022,6 +8023,7 @@ test_56xd() { local layout_after; test_mkdir "$dir" || error "cannot create dir $dir" + stack_trap "rm -rf $dir" $LFS setstripe $layout_yaml $f_yaml || error "cannot setstripe $f_yaml with layout $layout_yaml" $LFS getstripe --yaml $f_yaml > $yamlfile @@ -8058,6 +8060,7 @@ test_56xe() { local layout_after="" test_mkdir "$dir" || error "cannot create dir $dir" + stack_trap "rm -rf $dir" $LFS setstripe $layout $f_comp || error "cannot setstripe $f_comp with layout $layout" layout_before=$(SKIP_INDEX=yes get_layout_param $f_comp) @@ -8090,6 +8093,7 @@ test_56xf() { local fid_after="" test_mkdir "$dir" || error "cannot create dir $dir" + stack_trap "rm -rf $dir" $LFS setstripe $layout $f_comp || error "cannot setstripe $f_comp with layout $layout" fid_before=$($LFS getstripe --fid $f_comp) @@ -8174,6 +8178,7 @@ test_56xg() { # init the file to migrate $LFS setstripe -c1 -i1 $DIR/$tfile || error "Unable to create $tfile on OST1" + stack_trap "rm -f $DIR/$tfile" dd if=/dev/urandom of=$DIR/$tfile bs=1M count=4 status=none || error "Unable to write on $tfile" @@ -8280,6 +8285,7 @@ test_56xj() { # LU-16571 "lfs migrate -b" can cause thread starvation on OSS test_mkdir $linkdir || error "fail to create $linkdir" $LFS setstripe -i 0 -c 1 -S1M $file + stack_trap "rm -rf $file $linkdir" dd if=/dev/urandom of=$file bs=1M count=10 || error "fail to create $file" @@ -9488,6 +9494,7 @@ test_64e() { local grants=$((wb_round_up + extent_tax)) $LFS setstripe -c 1 -i 0 $DIR/$tfile || error "lfs setstripe failed" + stack_trap "rm -f $DIR/$tfile" # define OBD_FAIL_TGT_NO_GRANT 0x725 # make the server not grant more back @@ -9644,6 +9651,7 @@ test_64h() { $LCTL set_param osc.*OST0000*.grant_shrink_interval=10 $LFS setstripe -c 1 -i 0 $DIR/$tfile + stack_trap "rm -f $DIR/$tfile" dd if=/dev/zero of=$DIR/$tfile bs=1M count=10 oflag=sync # drop cache so that coming read would do rpc @@ -9683,6 +9691,7 @@ test_64i() { remote_ost_nodsh && skip "remote OSTs with nodsh" $LFS setstripe -c 1 -i 0 $DIR/$tfile + stack_trap "rm -f $DIR/$tfile" dd if=/dev/zero of=$DIR/$tfile bs=1M count=64 @@ -10200,6 +10209,7 @@ test_69() { f="$DIR/$tfile" $LFS setstripe -c 1 -i 0 $f + stack_trap "rm -f $f ${f}.2" $DIRECTIO write ${f}.2 0 1 || error "directio write error" @@ -10217,7 +10227,6 @@ test_69() { $DIRECTIO read $f 1 1 && error "read succeeded, expect -ENOENT" do_facet ost1 lctl set_param fail_loc=0 - rm -f $f } run_test 69 "verify oa2dentry return -ENOENT doesn't LBUG ======" @@ -12326,6 +12335,7 @@ test_103b() { declare -a pids local U + stack_trap "rm -f $DIR/$tfile.*" for U in {0..511}; do { local O=$(printf "%04o" $U) @@ -13896,6 +13906,7 @@ test_123e() { mkdir $dir || error "mkdir $dir failed" $LFS setstripe -C 32 $dir || error "setstripe $dir failed" + stack_trap "rm -rf $dir" touch $dir/$tfile.{0..1000} || error "touch 1000 files failed" @@ -13920,6 +13931,7 @@ test_123f() { mkdir $dir || error "mkdir $dir failed" $LFS setstripe -C 1000 $dir || error "setstripe $dir failed" + stack_trap "rm -rf $dir" touch $dir/$tfile.{0..200} || error "touch 200 files failed" @@ -14525,6 +14537,7 @@ OLDIFS="$IFS" cleanup_130() { trap 0 IFS="$OLDIFS" + rm -f $DIR/$tfile } test_130a() { @@ -14746,6 +14759,7 @@ test_130e() { local fm_file=$DIR/$tfile $LFS setstripe -S 131072 -c 2 $fm_file || error "setstripe on $fm_file" + stack_trap "rm -f $fm_file" local num_blks=512 local expected_len=$(( (num_blks / 2) * 64 )) @@ -15622,7 +15636,7 @@ test_150d() { [[ "x$DOM" == "xyes" ]] && striping="-L mdt" - stack_trap "rm -f $DIR/$tfile; wait_delete_completed" + stack_trap "rm -f $DIR/$tdir; wait_delete_completed" $LFS setstripe -E1M $striping -E eof -c $OSTCOUNT -S1M $DIR/$tdir || error "setstripe failed" fallocate -o 1G -l ${OSTCOUNT}m $DIR/$tdir || error "fallocate failed" @@ -19329,14 +19343,12 @@ test_187a() { local file=$dir0/file1 dd if=/dev/urandom of=$file count=10 bs=1M conv=fsync + stack_trap "rm -f $file" local dv1=$($LFS data_version $file) dd if=/dev/urandom of=$file seek=10 count=1 bs=1M conv=fsync local dv2=$($LFS data_version $file) [[ $dv1 != $dv2 ]] || error "data version did not change on write $dv1 == $dv2" - - # clean up - rm -f $file1 } run_test 187a "Test data version change" @@ -19781,6 +19793,7 @@ test_205d() { test_mkdir -i 0 $DIR/$tdir $LFS setstripe -E 1M -L mdt -E -1 $file || error "create file failed" + stack_trap "rm -rf $DIR/$tdir" dd if=/dev/zero of=$file bs=1M count=10 conv=sync || error "failed to write data to $file" @@ -19820,6 +19833,7 @@ test_205e() { stack_trap "$LCTL set_param ${cli_params[*]}" EXIT mkdir_on_mdt0 $DIR/$tdir || error "failed to create dir" + stack_trap "rm -rf $DIR/$tdir" $LFS setstripe -E EOF -i 0 -c 1 $file || error "failed to create $file on ost1" @@ -20509,6 +20523,7 @@ test_224c() { # LU-6441 #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3 0x520 do_facet ost1 "$LCTL set_param fail_loc=0x520" $LFS setstripe -c 1 -i 0 $DIR/$tfile + stack_trap "rm -f $DIR/$tfile" dd if=/dev/zero of=$DIR/$tfile bs=8MB count=1 sync do_facet ost1 "$LCTL set_param fail_loc=0" @@ -21938,6 +21953,7 @@ test_231a() mkdir -p $DIR/$tdir $LFS setstripe -S ${brw_size}M $DIR/$tdir || error "failed to set stripe with -S ${brw_size}M option" + stack_trap "rm -rf $DIR/$tdir" # clear the OSC stats $LCTL set_param osc.*.stats=0 &>/dev/null @@ -21975,6 +21991,7 @@ run_test 231a "checking that reading/writing of BRW RPC size results in one RPC" test_231b() { mkdir -p $DIR/$tdir + stack_trap "rm -rf $DIR/$tdir" local i for i in {0..1023}; do dd if=/dev/zero of=$DIR/$tdir/$tfile conv=notrunc \ @@ -21994,6 +22011,7 @@ test_232a() { # ignore dd failure dd if=/dev/zero of=$DIR/$tdir/$tfile bs=1M count=1 || true + stack_trap "rm -f $DIR/$tdir/$tfile" do_facet ost1 $LCTL set_param fail_loc=0 umount_client $MOUNT || error "umount failed" @@ -22010,6 +22028,7 @@ test_232b() { mkdir -p $DIR/$tdir $LFS setstripe -c1 -i0 $DIR/$tdir/$tfile dd if=/dev/zero of=$DIR/$tdir/$tfile bs=1M count=1 + stack_trap "rm -f $DIR/$tdir/$tfile" sync cancel_lru_locks osc @@ -22802,6 +22821,7 @@ test_253() { wait_mds_ost_sync wait_delete_completed mkdir $DIR/$tdir + stack_trap "rm -rf $DIR/$tdir" pool_add $TESTNAME || error "Pool creation failed" pool_add_targets $TESTNAME 0 || error "Pool add targets failed" @@ -24117,6 +24137,7 @@ test_272b() { local dom=$DIR/$tdir/dom mkdir -p $DIR/$tdir $LFS setstripe -E 1M -L mdt -E -1 -c1 $dom + stack_trap "rm -rf $DIR/$tdir" local mdtidx=$($LFS getstripe -m $dom) local mdtname=MDT$(printf %04x $mdtidx) @@ -24159,6 +24180,7 @@ test_272c() { local dom=$DIR/$tdir/$tfile mkdir -p $DIR/$tdir $LFS setstripe -E 1M -L mdt -E -1 -c1 $dom + stack_trap "rm -rf $DIR/$tdir" local mdtidx=$($LFS getstripe -m $dom) local mdtname=MDT$(printf %04x $mdtidx) @@ -24357,6 +24379,7 @@ test_275() { dd if=/dev/urandom of=$file bs=1M count=2 || error "failed to create a file" + stack_trap "rm -f $file" cancel_lru_locks osc #lock 1 @@ -25730,6 +25753,7 @@ test_398a() { # LU-4198 cut -d'.' -f2) $LFS setstripe -c 1 -i 0 $DIR/$tfile + stack_trap "rm -f $DIR/$tfile" $LCTL set_param ldlm.namespaces.*.lru_size=clear # request a new lock on client -- 1.8.3.1