From edb0fb241bb5e0cc95c240ed977abf7f234ee045 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 5 Jun 2017 13:22:17 -0600 Subject: [PATCH] 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 Change-Id: I534f0a1f36c3d00f702684041bfa991a4a3ebbe5 Reviewed-on: https://review.whamcloud.com/27441 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Sebastien Buisson Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 () { -- 1.8.3.1