From: Li Wei <wei.g.li@intel.com>
Date: Mon, 25 Mar 2013 05:59:25 +0000 (+0800)
Subject: LU-3003 tests: Do "lctl conf_param" on mds1 in t32_test()
X-Git-Tag: 2.3.64~78
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c95b4c92009ebcf6361986d3973ae689d25d7c7a

LU-3003 tests: Do "lctl conf_param" on mds1 in t32_test()

With DNE, conf-sanity 32c inovkes "lctl conf_param" on mds2's host,
which may not be where the MGS is running, causing errors like:

  CMD: c05 /usr/sbin/lctl conf_param
  t32fs-MDT0001.mdc.max_rpcs_in_flight=9
  c05: No device found for name MGS: Invalid argument
  c05: This command must be run on the MGS.
  c05: error: conf_param: No such device
   conf-sanity test_32c: @@@@@@ FAIL: Setting MDT1
  "max_rpcs_in_flight"

This patch changes these "lctl conf_param" commands to set the same
parameters but on mds1's host, which always hosts the MGS.

Change-Id: Ibdca2802eaf33db504ed2b41a356d7a18be33f10
Signed-off-by: Li Wei <wei.g.li@intel.com>
Reviewed-on: http://review.whamcloud.com/5829
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: wangdi <di.wang@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index d29fd7e..c752454 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1655,16 +1655,16 @@ t32_test() {
 	}
 
 	if [ "$dne_upgrade" != "no" ]; then
-		$r2 $LCTL conf_param \
+		$r $LCTL conf_param \
 				$fsname-MDT0001.mdc.max_rpcs_in_flight=9 || {
 			error_noexit "Setting MDT1 \"max_rpcs_in_flight\""
 			return 1
 		}
-		$r2 $LCTL conf_param $fsname-MDT0001.failover.node=$nid || {
+		$r $LCTL conf_param $fsname-MDT0001.failover.node=$nid || {
 			error_noexit "Setting MDT1 \"failover.node\""
 			return 1
 		}
-		$r2 $LCTL conf_param $fsname-MDT0001.lov.stripesize=4M || {
+		$r $LCTL conf_param $fsname-MDT0001.lov.stripesize=4M || {
 			error_noexit "Setting MDT1 \"lov.stripesize\""
 			return 1
 		}