From ed016772eaf87201904b27cf630699728ca5d2d4 Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Sun, 22 Sep 2024 21:10:20 -0400 Subject: [PATCH] LU-15553 test: mkdir_on_mdt0 in conf-sanity.sh Change mkdir to mkdir_on_mdt0 in several conf-sanity.sh sub tests. Fixes: b9c4dc3c33 ("LU-14792 llite: enable filesystem-wide default LMV") Test-Parameters: trivial testlist=conf-sanity mdtcount=4 Signed-off-by: Lai Siyao Change-Id: I5ace9df10e725802ba502ca20c60afc708b857cc Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56539 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index b13afdb..ec2abe75 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -3766,7 +3766,8 @@ test_35b() { # bug 18674 at_max_set 0 mds client fi - mkdir $MOUNT/$tdir || error "mkdir $MOUNT/$tdir failed" + rm -rf $MOUNT/$tdir + mkdir_on_mdt0 $MOUNT/$tdir || error "mkdir $MOUNT/$tdir failed" log "Injecting EBUSY on MDS" # Setting OBD_FAIL_MDS_RESEND=0x136 @@ -3955,7 +3956,8 @@ test_38() { # bug 14222 local FILES=$(find $SRC -type f -mtime +1 | head -n $COUNT) log "copying $(echo $FILES | wc -w) files to $DIR/$tdir" - mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed" + rm -rf $DIR/$tdir + mkdir_on_mdt0 $DIR/$tdir || error "mkdir $DIR/$tdir failed" tar cf - $FILES | tar xf - -C $DIR/$tdir || error "copying $SRC to $DIR/$tdir" sync @@ -5068,7 +5070,7 @@ test_51() { setup_noconfig check_mount || error "check_mount failed" - mkdir $MOUNT/$tdir || error "mkdir $MOUNT/$tdir failed" + mkdir_on_mdt0 $MOUNT/$tdir || error "mkdir $MOUNT/$tdir failed" $LFS setstripe -c -1 $MOUNT/$tdir || error "$LFS setstripe -c -1 $MOUNT/$tdir failed" #define OBD_FAIL_MDS_REINT_DELAY 0x142 @@ -8733,7 +8735,7 @@ test_101a() { local dev=$FSNAME-OST0000-osc-MDT0000 setup - mkdir $DIR1/$tdir + mkdir_on_mdt0 $DIR1/$tdir do_nodes $(comma_list $(osts_nodes)) $LCTL set_param \ seq.*OST*-super.width=$DATA_SEQ_MAX_WIDTH createmany -o $DIR1/$tdir/$tfile-%d 50000 & @@ -8764,7 +8766,7 @@ test_101b () { local dir=$DIR1/$tdir setup - mkdir $dir + mkdir_on_mdt0 $dir $LFS setstripe -c 1 -i 0 $dir do_facet $SINGLEMDS "$LCTL --device $dev deactivate;" #define OBD_FAIL_OSP_CON_EVENT_DELAY 0x2107 -- 1.8.3.1