X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-vbr.sh;h=a6301a3216be72fc13865500d12c73a2252e54e1;hb=072d6b3156bf3b5d1738b43aadcba5c378c59ee9;hp=f633a0d2ff00b78ee9cfb18cf09b4c577b64b261;hpb=5c99a57116e389ec455e0789f0ace850dd7763fd;p=fs%2Flustre-release.git diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh index f633a0d..a6301a3 100644 --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -7,6 +7,12 @@ set -e # bug number: 16356 ALWAYS_EXCEPT="12a $REPLAY_VBR_EXCEPT" +case "$(lsb_release -sr)" in # only disable tests for el7 +7*) # bug number: LU-6455 + ALWAYS_EXCEPT="$ALWAYS_EXCEPT 4i 4j 4k 10b" + ;; +esac + SAVE_PWD=$PWD LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} SETUP=${SETUP:-} @@ -711,12 +717,6 @@ test_7_cycle() { do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0" do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0" - local at_max_saved=0 - if at_is_enabled; then - at_max_saved=$(at_max_get $SINGLEMDS) - at_max_set $TIMEOUT mds client - fi - do_node $CLIENT1 mkdir -p $DIR/$tdir replay_barrier $SINGLEMDS # first operation @@ -736,7 +736,6 @@ test_7_cycle() { wait_recovery_complete $SINGLEMDS wait_mds_ost_sync || error "wait_mds_ost_sync failed" - [[ $at_max_saved -eq 0 ]] || at_max_set $at_max_saved mds client rm -rf $DIR/$tdir return $rc }