X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=865cac448248c714b9fd853965bf9d10cbd76f46;hp=7d68c918a8d17776c853da3ed81e9a2741bdf147;hb=d48a0ebb5a8d5d49684325434b503e8aab085397;hpb=775f88ed6c8b6235031268e258e15da405a5b955 diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 7d68c91..865cac4 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1641,7 +1641,7 @@ test_27ce() { [[ $($LCTL get_param mdc.*.import) =~ connect_flags.*overstriping ]] || skip "server does not support overstriping" # We do one more stripe than we have OSTs - [ $OSTCOUNT -ge 159 ] || large_xattr_enabled || + [ $OSTCOUNT -lt 159 ] || large_xattr_enabled || skip_env "ea_inode feature disabled" test_mkdir -p $DIR/$tdir @@ -2448,7 +2448,7 @@ test_27Cb() { test_mkdir -p $DIR/$tdir local setcount=$(($OSTCOUNT * 2)) - [ $setcount -ge 160 ] || large_xattr_enabled || + [ $setcount -lt 160 ] || large_xattr_enabled || skip_env "ea_inode feature disabled" $LFS setstripe -C $setcount $DIR/$tdir/$tfile || @@ -2474,7 +2474,7 @@ test_27Cc() { test_mkdir -p $DIR/$tdir local setcount=$(($OSTCOUNT - 1)) - [ $setcount -ge 160 ] || large_xattr_enabled || + [ $setcount -lt 160 ] || large_xattr_enabled || skip_env "ea_inode feature disabled" $LFS setstripe -C $setcount $DIR/$tdir/$tfile || @@ -2554,7 +2554,7 @@ test_27Cf() { test_mkdir -p $DIR/$tdir local setcount=$(($OSTCOUNT * 2)) - [ $setcount -ge 160 ] || large_xattr_enabled || + [ $setcount -lt 160 ] || large_xattr_enabled || skip_env "ea_inode feature disabled" $LFS setstripe -C $setcount $DIR/$tdir/ || @@ -5242,17 +5242,14 @@ test_44A() { # was test_44 run_test 44A "zero length read from a sparse stripe" test_44a() { - local nstripe=$($LCTL lov_getconfig $DIR | grep default_stripe_count: | - awk '{ print $2 }') + local nstripe=$($LFS getstripe -c -d $DIR) [ -z "$nstripe" ] && skip "can't get stripe info" [[ $nstripe -gt $OSTCOUNT ]] && - skip "Wrong default_stripe_count: $nstripe OSTCOUNT: $OSTCOUNT" + skip "Wrong default stripe_count: $nstripe OSTCOUNT: $OSTCOUNT" - local stride=$($LCTL lov_getconfig $DIR | grep default_stripe_size: | - awk '{ print $2 }') + local stride=$($LFS getstripe -S -d $DIR) if [[ $nstripe -eq 0 || $nstripe -eq -1 ]]; then - nstripe=$($LCTL lov_getconfig $DIR | grep obd_count: | - awk '{ print $2 }') + nstripe=$($LFS df $DIR | grep OST: | wc -l) fi OFFSETS="0 $((stride/2)) $((stride-1))" @@ -21353,6 +21350,17 @@ test_273a() { } run_test 273a "DoM: layout swapping should fail with DOM" +test_273b() { + mkdir -p $DIR/$tdir + $LFS setstripe -E 1M -L mdt -E -1 -c -1 $DIR/$tdir + +#define OBD_FAIL_MDS_COMMITRW_DELAY 0x16b + do_facet mds1 $LCTL set_param fail_loc=0x8000016b fail_val=2 + + $MULTIOP $DIR/$tdir/$tfile Ouw2097152c +} +run_test 273b "DoM: race writeback and object destroy" + test_275() { remote_ost_nodsh && skip "remote OST with nodsh" [ $OST1_VERSION -lt $(version_code 2.10.57) ] &&