From: Jinshan Xiong <jinshan.xiong@intel.com>
Date: Tue, 16 May 2017 22:53:37 +0000 (-0700)
Subject: LU-9485 test: revert a change from LU-5361
X-Git-Tag: 2.9.59~65
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e125515c4c48094379cf828085ddcd166861cb6a;p=fs%2Flustre-release.git

LU-9485 test: revert a change from LU-5361

Revert the changes from patch 5c315184152 in test-framework.sh
that caused wait_osc_import_state() not working.

Test-Parameters: trivial \
mdtfilesystemtype=zfs ostfilesystemtype=zfs \
testlist=conf-sanity,conf-sanity,conf-sanity

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: Ic20d5d7fa7344383d5999aa2684b736e64309ebb
Reviewed-on: https://review.whamcloud.com/27148
Tested-by: Jenkins
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@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 d69e988..653709d 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -6122,7 +6122,6 @@ _wait_osc_import_state() {
 	if [[ $facet == client* ]]; then
 		# During setup time, the osc might not be setup, it need wait
 		# until list_param can return valid value.
-		param="osc.${ost%?}[^mM]*.ost_server_uuid"
 		params=$($LCTL list_param $param 2>/dev/null || true)
 		while [ -z "$params" ]; do
 			if [ $i -ge $maxtime ]; then