X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Frecovery-small.sh;h=90edbf22212ec8904022c30130f3a49e9ca7db8f;hp=c6ef161ed90d060560fa2c5c37fba81482dc04c1;hb=169738e3;hpb=8ad9453ee66ec1beaff9c8711cf732a861176a6f diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index c6ef161..90edbf2 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -2109,27 +2109,27 @@ test_110f () { run_test 110f "remove remote directory: drop slave rep" test_110g () { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.57) ]] || - { skip "Need MDS version at least 2.6.57"; return 0; } + [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.11.0) ]] || + { skip "Need MDS version at least 2.11.0"; return 0; } [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0 - local remote_dir=$DIR/$tdir/remote_dir - local mdtidx=1 - - mkdir -p $remote_dir - - createmany -o $remote_dir/f 100 - #define OBD_FAIL_MIGRATE_NET_REP 0x1800 - do_facet mds$mdtidx lctl set_param fail_loc=0x1800 - $LFS migrate -m $mdtidx $remote_dir || error "migrate failed" - do_facet mds$mdtidx lctl set_param fail_loc=0x0 + mkdir -p $DIR/$tdir + touch $DIR/$tdir/$tfile - for file in $(find $remote_dir); do - mdt_index=$($LFS getstripe -m $file) - [ $mdt_index == $mdtidx ] || - error "$file is not on MDT${mdtidx}" - done + # OBD_FAIL_MDS_REINT_NET_REP 0x119 + do_facet mds1 $LCTL set_param fail_loc=0x119 + $LFS migrate -m 1 $DIR/$tdir & + migrate_pid=$! + sleep 5 + do_facet mds1 $LCTL set_param fail_loc=0 + wait $migrate_pid + + local mdt_index + mdt_index=$($LFS getstripe -m $DIR/$tdir) + [ $mdt_index == 1 ] || error "$tdir is not on MDT1" + mdt_index=$($LFS getstripe -m $DIR/$tdir/$tfile) + [ $mdt_index == 1 ] || error "$tfile is not on MDT1" rm -rf $DIR/$tdir || error "rmdir failed" }