From: Andreas Dilger <adilger@whamcloud.com>
Date: Mon, 22 Oct 2018 23:10:57 +0000 (+0800)
Subject: LU-11556 tests: fix set_persistent_param_and_check breakage
X-Git-Tag: 2.12.0-RC1~129
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cf9745943f6e003ef207adcab039cd472e6f3068

LU-11556 tests: fix set_persistent_param_and_check breakage

Since patch https://review.whamcloud.com/30087 "LU-7004 tests: move
from lctl conf_param to lctl set_param -P" was landed, there are
a few places that call set_persistent_param_and_check() with a node
name as an argument instead of a facet.

Fix the few places that are doing this.  Note that the call to
t32_verify_quota() is not enabled in this patch because of LU-11558,
since it is entirely possible that this code is currently broken.
This patch is about fixing set_persistent_param_and_check() breakage,
and t32_verify_quota() re-enablement can be done in a second patch.

Test-Parameters: trivial testlist=conf-sanity
Test-Parameters: testlist=conf-sanity mdtfilesystemtype=zfs ostfilesystemtype=zfs
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I47473844c6103efe9c73c780de24605f4e3ebbe5
Reviewed-on: https://review.whamcloud.com/33422
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index a142cd6..50361a1 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1554,7 +1554,7 @@ t32_wait_til_devices_gone() {
 }
 
 t32_verify_quota() {
-	local node=$1
+	local facet=$1
 	local fsname=$2
 	local mnt=$3
 	local fstype=$(facet_fstype $SINGLEMDS)
@@ -1566,7 +1566,7 @@ t32_verify_quota() {
 	# verification in 32b. The object quota usage should be accurate after
 	# zfs-0.7.0 is released.
 	[ $fstype == "zfs" ] && {
-		local zfs_version=$(do_node $node cat /sys/module/zfs/version)
+		local zfs_version=$(do_facet $facet cat /sys/module/zfs/version)
 
 		[ $(version_code $zfs_version) -lt $(version_code 0.7.0) ] && {
 			echo "Skip quota verify for zfs: $zfs_version"
@@ -1612,13 +1612,13 @@ t32_verify_quota() {
 		return 1
 	}
 
-	set_persistent_param_and_check $node \
+	set_persistent_param_and_check $facet \
 		"osd-$fstype.$fsname-MDT0000.quota_slave.enabled" \
-		$fsname.quota.mdt" ug
+		"$fsname.quota.mdt" ug
 
-	set_persistent_param_and_check $node \
+	set_persistent_param_and_check $facet \
 		"osd-$fstype.$fsname-OST0000.quota_slave.enabled" \
-		$fsname.quota.ost" ug
+		"$fsname.quota.ost" ug
 
 	chmod 0777 $mnt
 	runas -u $T32_QID -g $T32_QID dd if=/dev/zero of=$mnt/t32_qf_new \
@@ -2024,6 +2024,12 @@ t32_test() {
 		shall_cleanup_lustre=true
 		$r $LCTL set_param debug="$PTLDEBUG"
 
+		# Leave re-enabling this to a separate patch for LU-11558
+		# t32_verify_quota $SINGLEMDS $fsname $tmp/mnt/lustre || {
+		#	error_noexit "verify quota failed"
+		#	return 1
+		#}
+
 		if $r test -f $tmp/list; then
 			#
 			# There is not a Test Framework API to copy files to or
@@ -2281,7 +2287,7 @@ t32_test() {
 		}
 		nrpcs=$((nrpcs_orig + 5))
 
-		set_persistent_param_and_check $HOSTNAME \
+		set_persistent_param_and_check client \
 		   "mdc.$fsname-MDT0000*.max_rpcs_in_flight" \
 		   "$fsname-MDT0000.mdc.max_rpcs_in_flight" $nrpcs || {
 			error_noexit "Changing \"max_rpcs_in_flight\""