From cce2c7390b14591e63d44b02de2a3a7d653eb9b4 Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Sun, 9 Mar 2014 01:11:05 +0800 Subject: [PATCH] LU-4748 test: get one single qos_threshold_rr number In sanity.sh test_116b, if there are multiple MDTs on the same MDS, we should get one single qos_threshold_rr number instead of the array, otherwise it will cause resetting qos_threshold_rr failure. This is a backport of Lustre-commit: b4a5e9545bcc9c4558fc8a564a8daa2ede997aa6 Lustre-change: http://review.whamcloud.com/9580/ Signed-off-by: Emoly Liu Change-Id: I6d7c143713dac809b2f308f7b4f0882345599638 Reviewed-on: http://review.whamcloud.com/9636 Tested-by: Jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e761f28..073a693 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -6932,14 +6932,17 @@ test_116b() { # LU-2093 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 lov.*mdtlov*.qos_threshold_rr) - do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr 0 + old_rr=$(do_facet $SINGLEMDS lctl get_param -n \ + lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr | head -1) + do_facet $SINGLEMDS lctl set_param \ + lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr=0 mkdir -p $DIR/$tdir do_facet $SINGLEMDS lctl set_param fail_loc=0x147 createmany -o $DIR/$tdir/f- 20 || error "can't create" do_facet $SINGLEMDS lctl set_param fail_loc=0 rm -rf $DIR/$tdir - do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr $old_rr + do_facet $SINGLEMDS lctl set_param \ + lo*.$FSNAME-MDT0000-mdtlov.qos_threshold_rr=$old_rr } run_test 116b "QoS shouldn't LBUG if not enough OSTs found on the 2nd pass" -- 1.8.3.1