From e125515c4c48094379cf828085ddcd166861cb6a Mon Sep 17 00:00:00 2001 From: Jinshan Xiong Date: Tue, 16 May 2017 15:53:37 -0700 Subject: [PATCH] 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 Change-Id: Ic20d5d7fa7344383d5999aa2684b736e64309ebb Reviewed-on: https://review.whamcloud.com/27148 Tested-by: Jenkins Reviewed-by: Jian Yu Reviewed-by: James Nunez Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 1 - 1 file changed, 1 deletion(-) 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 -- 1.8.3.1