From: Nathan Rutman <nathan.rutman@oracle.com>
Date: Fri, 20 Aug 2010 21:16:04 +0000 (-0700)
Subject: b=23595 fix conf-sanity 57 for remote ost
X-Git-Tag: v1_8_4_51~27
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d6492a37697e937627d5f701c5a7aa0d3f03d3f9;p=fs%2Flustre-release.git

b=23595 fix conf-sanity 57 for remote ost

i=vitaly.fertman
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8f10a87..335fd57 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2259,13 +2259,10 @@ test_56() {
 run_test 56 "check big indexes"
 
 test_57() { # bug 22656
-	local NID=$($LCTL list_nids | head -1)
+	local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
 	writeconf
 	do_facet ost1 "$TUNEFS --failnode=$NID `ostdevname 1`" || error "tunefs failed"
-	if ! combined_mgs_mds ; then
-		start_mgs
-	fi
-	start_mds
+	start_mgsmds
 	stop_mds
 	start_ost && error "OST registration from failnode should fail"
 	reformat