From: Andreas Dilger <andreas.dilger@intel.com>
Date: Mon, 5 Jun 2017 19:22:17 +0000 (-0600)
Subject: LU-7631 tests: wait_osts_up waits for MDS precreates
X-Git-Tag: 2.10.51~108
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F27441%2F2;p=fs%2Flustre-release.git

LU-7631 tests: wait_osts_up waits for MDS precreates

Fix wait_osts_up() to wait for the MDS to finish orphan cleanup and
precreate some OST objects so that there isn't a race to get all of
the OSTs available for conf-sanity test_82a.

Test-Parameters: trivial testlist=replay-single,replay-single
Test-Parameters: testlist=conf-sanity,conf-sanity,conf-sanity
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: I534f0a1f36c3d00f702684041bfa991a4a3ebbe5
Reviewed-on: https://review.whamcloud.com/27441
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index df39aed..4b0182e 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2430,10 +2430,10 @@ wait_osts_up() {
 	wait_update $HOSTNAME "eval $cmd" $OSTCOUNT ||
 		error "wait_update OSTs up on client failed"
 
-	cmd="$LCTL get_param -n lod.$FSNAME-MDT*-*.target_obd | sort -u |
-	     awk 'BEGIN {c = 0} /ACTIVE/{c += 1} END {printf \\\"%d\\\", c}'"
+	cmd="$LCTL get_param osp.$FSNAME-OST*-MDT0000.prealloc_last_id |
+	     awk '/=[1-9][0-9]/ { c += 1 } END { printf \\\"%d\\\", c }'"
 	wait_update_facet $SINGLEMDS "eval $cmd" $OSTCOUNT ||
-		error "wait_update OSTs up on MDT failed"
+		error "wait_update OSTs up on MDT0000 failed"
 }
 
 wait_destroy_complete () {