From: Andreas Dilger Date: Wed, 7 Jan 2015 08:22:57 +0000 (-0700) Subject: LU-4808 tests: don't skip sanity test_116b incorrectly X-Git-Tag: 2.6.93~32 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5104ed94f3f41d30ddfb87be4d815c1b604dd412 LU-4808 tests: don't skip sanity test_116b incorrectly An exception was added in http://review.whamcloud.com/9766 (commit e217648d50da) to skip sanity test_116b if running against an MDS that does not have the qos_threshold_rr tunable, but this was incorrectly checking the local (client) for the tunable instead of the MDS. Fix the check to run on the MDS. Signed-off-by: Andreas Dilger Change-Id: Ia1ae05373af9e92d91710761f1da6470f8500c1e Reviewed-on: http://review.whamcloud.com/13263 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index d564937..77c588a 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -7342,12 +7342,10 @@ run_test 116a "stripe QOS: free space balance ===================" test_116b() { # LU-2093 [ $PARALLEL == "yes" ] && skip "skip parallel run" && return - [ -z "$($LCTL get_param -n lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr | - head -1 2>/dev/null)" ] && skip "no QOS" && return #define OBD_FAIL_MDS_OSC_CREATE_FAIL 0x147 - local old_rr - old_rr=$(do_facet $SINGLEMDS lctl get_param -n \ - lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr | head -1) + local old_rr=$(do_facet $SINGLEMDS lctl get_param -n \ + lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr | head -1) + [ -z "$old_rr" ] && skip "no QOS" && return 0 do_facet $SINGLEMDS lctl set_param \ lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr=0 mkdir -p $DIR/$tdir