From 3f8e14163a57ddf51047efc1c0a1b9c15631e2b4 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Fri, 28 May 2021 23:45:20 -0400 Subject: [PATCH] LU-14721 tests: wait_destroy_complete should check MDTs Ever since destroys handling was moved to MDTs we need to move waiting for destroys completion to MDTs as well. Change-Id: I31440ec048b960206a903387d7050aa13e45008d Signed-off-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/43870 Tested-by: jenkins Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev Tested-by: Maloo --- lustre/tests/test-framework.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 0a34e25..f640200 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -3417,14 +3417,15 @@ wait_osts_up() { } wait_destroy_complete () { - echo "Waiting for local destroys to complete" + echo "Waiting for MDT destroys to complete" # MAX value shouldn't be big as this mean server responsiveness # never increase this just to make test pass but investigate # why it takes so long time local MAX=5 local WAIT=0 + local list=$(comma_list $(mdts_nodes)) while [ $WAIT -lt $MAX ]; do - local -a RPCs=($($LCTL get_param -n osc.*.destroys_in_flight)) + local -a RPCs=($(do_nodes $list $LCTL get_param -n osp.*.destroys_in_flight)) local con=1 local i @@ -3439,7 +3440,7 @@ wait_destroy_complete () { echo "Waiting ${WAIT}s for local destroys to complete" WAIT=$((WAIT + 1)) done - echo "Local destroys weren't done in $MAX sec." + echo "MDT destroys weren't done in $MAX sec." return 1 } -- 1.8.3.1