From: Patrick Farrell <pfarrell@whamcloud.com>
Date: Wed, 6 Nov 2019 18:55:04 +0000 (-0700)
Subject: LU-12488 tests: Fix sanityn 93 for DNE configs
X-Git-Tag: 2.13.51~99
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=98e7614b9f422d45f5d1789eb550d1b7947522b1;p=fs%2Flustre-release.git

LU-12488 tests: Fix sanityn 93 for DNE configs

sanityn test 93 only uses MDT0, but it is getting the parameter
qos_threshold_rr for all MDTs.  This confused the test when
trying to reset the parameter value.

Just limit everything to MDT0. Also modernize lctl vs
$LCTL usage and replace hardwired file system name with
$FSNAME.

Test-Parameters: trivial
Test-Parameters: testlist=sanityn
Test-Parameters: fstype=ldiskfs clientcount=2 mdscount=2 mdtcount=4 osscount=1 ostcount=8 testlist=sanityn
Test-Parameters: fstype=zfs clientcount=2 mdscount=2 mdtcount=4 osscount=1 ostcount=8 testlist=sanityn


Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: Iff9cca4ce3d2e5ad4e499bba0369189bea21448a
Reviewed-on: https://review.whamcloud.com/35366
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 79d762a..db37781 100755
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -4484,12 +4484,12 @@ test_93() {
 
 	mkdir -p $DIR1/$tfile-1/
 	mkdir -p $DIR2/$tfile-2/
-	local old_rr=$(do_facet $SINGLEMDS lctl get_param -n \
-		'lod.lustre-MDT*/qos_threshold_rr' | sed -e 's/%//')
-	do_facet $SINGLEMDS lctl set_param -n \
-		'lod.lustre-MDT*/qos_threshold_rr' 100
+	local old_rr=$(do_facet $SINGLEMDS "$LCTL get_param -n \
+		lod.$FSNAME-MDT0000-*/qos_threshold_rr" | sed -e 's/%//')
+	do_facet $SINGLEMDS "$LCTL set_param -n \
+		lod.$FSNAME-MDT0000-*/qos_threshold_rr=100"
 	#define OBD_FAIL_MDS_LOV_CREATE_RACE     0x163
-	do_facet $SINGLEMDS "lctl set_param fail_loc=0x00000163"
+	do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x00000163"
 
 	$LFS setstripe -c -1 $DIR1/$tfile-1/file1 &
 	local PID1=$!
@@ -4498,9 +4498,9 @@ test_93() {
 	local PID2=$!
 	wait $PID2
 	wait $PID1
-	do_facet $SINGLEMDS "lctl set_param fail_loc=0x0"
-	do_facet $SINGLEMDS "lctl set_param -n \
-		'lod.lustre-MDT*/qos_threshold_rr' $old_rr"
+	do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x0"
+	do_facet $SINGLEMDS "$LCTL set_param -n \
+		lod.$FSNAME-MDT0000-*/qos_threshold_rr=$old_rr"
 
 	$LFS getstripe $DIR1/$tfile-1/file1
 	rc1=$($LFS getstripe -q $DIR1/$tfile-1/file1 |