From: Elena Gryaznova Date: Thu, 16 Jul 2015 16:40:41 +0000 (+0300) Subject: LU-6124 test: skip tests require remote server with nodsh set X-Git-Tag: 2.7.58~26 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=ea383222e031cdceffbdf2e3afab3b6d1fd53c8e LU-6124 test: skip tests require remote server with nodsh set Patch fixes the following tests to be skipped for remote servers with nodsh set: - sanity 116a, 116b, 160c, 205, 220, 225a, 225b, 230c; - sanityn 34, 40a, 40b, 40c, 40d, 40e. Signed-off-by: Elena Gryaznova Xyratex-bug-id: MRP-1720 Reviewed-by: Vladimir Saveliev Change-Id: I5567e752f0d05c2447de595cb72c754e06e2fe83 Reviewed-on: http://review.whamcloud.com/13406 Tested-by: Jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 9a4d231..232c45c 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -7295,6 +7295,8 @@ free_min_max () { test_116a() { # was previously test_116() [ $PARALLEL == "yes" ] && skip "skip parallel run" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return + [[ $OSTCOUNT -lt 2 ]] && skip_env "$OSTCOUNT < 2 OSTs" && return echo -n "Free space priority " @@ -7414,6 +7416,8 @@ run_test 116a "stripe QOS: free space balance ===================" test_116b() { # LU-2093 [ $PARALLEL == "yes" ] && skip "skip parallel run" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return + #define OBD_FAIL_MDS_OSC_CREATE_FAIL 0x147 local old_rr=$(do_facet $SINGLEMDS lctl get_param -n \ lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr | head -1) @@ -10456,6 +10460,8 @@ test_160b() { # LU-3587 run_test 160b "Verify that very long rename doesn't crash in changelog" test_160c() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return + local rc=0 local server_version=$(lustre_version_code $SINGLEMDS) @@ -11580,6 +11586,9 @@ cleanup_205() { test_205() { # Job stats [ $PARALLEL == "yes" ] && skip "skip parallel run" && return remote_mgs_nodsh && skip "remote MGS with nodsh" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return + remote_ost_nodsh && skip "remote OST with nodsh" && return + [ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ] && skip "Server doesn't support jobstats" && return 0 [[ $JOBID_VAR = disable ]] && skip "jobstats is disabled" && return @@ -11718,9 +11727,9 @@ test_208() { # for now as only exclusive open is supported. After generic lease # is done, this test suite should be revised. - Jinshan + remote_mds_nodsh && skip "remote MDS with nodsh" && return [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.52) ]] || { skip "Need MDS version at least 2.4.52"; return 0; } - remote_mds_nodsh && skip "remote MDS with nodsh" && return echo "==== test 1: verify get lease work" $MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:eRE+eU || error "get lease error" @@ -12048,6 +12057,8 @@ run_test 219 "LU-394: Write partial won't cause uncontiguous pages vec at LND" test_220() { #LU-325 [ $PARALLEL == "yes" ] && skip "skip parallel run" && return remote_ost_nodsh && skip "remote OST with nodsh" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return + remote_mgs_nodsh && skip "remote MGS with nodsh" && return local OSTIDX=0 test_mkdir -p $DIR/$tdir @@ -12218,6 +12229,7 @@ run_test 224c "Don't hang if one of md lost during large bulk RPC" MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)} test_225a () { [ $PARALLEL == "yes" ] && skip "skip parallel run" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return if [ -z ${MDSSURVEY} ]; then skip_env "mds-survey not found" && return fi @@ -12247,7 +12259,7 @@ run_test 225a "Metadata survey sanity with zero-stripe" test_225b () { [ $PARALLEL == "yes" ] && skip "skip parallel run" && return - + remote_mds_nodsh && skip "remote MDS with nodsh" && return if [ -z ${MDSSURVEY} ]; then skip_env "mds-survey not found" && return fi @@ -12718,6 +12730,7 @@ run_test 230b "migrate directory" test_230c() { [ $PARALLEL == "yes" ] && skip "skip parallel run" && return + remote_mds_nodsh && skip "remote MDS with nodsh" && return [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return local MDTIDX=1 local mdt_index diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 099702b..9acd1cb 100644 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -983,6 +983,7 @@ cleanup_34() { } test_34() { #16129 + remote_ost_nodsh && skip "remote OST with nodsh" && return local OPER local lock_in local lock_out @@ -1260,6 +1261,7 @@ check_pdo_conflict() { # pdirop tests # test 40: check non-blocking operations test_40a() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 touch $DIR2 @@ -1289,6 +1291,7 @@ test_40a() { run_test 40a "pdirops: create vs others ==============" test_40b() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 touch $DIR1/$tfile & @@ -1318,6 +1321,7 @@ test_40b() { run_test 40b "pdirops: open|create and others ==============" test_40c() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1348,6 +1352,7 @@ test_40c() { run_test 40c "pdirops: link and others ==============" test_40d() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 @@ -1377,6 +1382,7 @@ test_40d() { run_test 40d "pdirops: unlink and others ==============" test_40e() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return touch $DIR1/$tfile #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK 0x145 do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 9bc0299..fdfa7b0 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -5250,6 +5250,7 @@ require_dsh_ost() remote_mgs_nodsh() { + [ "$CLIENTONLY" ] && return 0 || true local MGS MGS=$(facet_host mgs) remote_node $MGS && [ "$PDSH" = "no_dsh" -o -z "$PDSH" -o -z "$ost_HOST" ]