From 3ed6b8c2ea27b1a3a9fa073e19d77d7c317ae69f Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 11 Feb 2019 12:47:09 -0500 Subject: [PATCH] LU-11206 tests: Use import_ready to check IDLE When checking if a client/OST import is up, we have to check for IDLE as well as FULL. wait_osc_import_ready is provided for this, but a few spots don't use it, so they occasionally fail. Signed-off-by: Patrick Farrell Change-Id: I826659a7f5953dee4e4551c1177479ef742b5589 Reviewed-on: https://review.whamcloud.com/34225 Reviewed-by: Alex Zhuravlev Reviewed-by: James Nunez Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 2 +- lustre/tests/sanity-flr.sh | 2 +- lustre/tests/sanity.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 5dfccb8..92feb15 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -6997,7 +6997,7 @@ test_93() { mount_client $MOUNT || error "mount client fails" wait_osc_import_state mds ost FULL - wait_osc_import_state client ost FULL + wait_osc_import_ready client ost check_mount || error "check_mount failed" cleanup || error "cleanup failed with $?" diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index 6a9dfc6..2298ec1 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -1078,7 +1078,7 @@ test_33() { [[ "$rs" == "ost1" ]] || error "file content error: expected: \"ost1\", actual: \"$rs\"" - wait_osc_import_state client ost2 FULL + wait_osc_import_ready client ost2 } run_test 33 "read can choose available mirror to read" diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 739df27..8b858b6 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -8688,7 +8688,7 @@ test_104a() { lfs df || error "lfs df with deactivated OSC failed" lctl --device %$OSC activate # wait the osc back to normal - wait_osc_import_state client ost FULL + wait_osc_import_ready client ost lfs df || error "lfs df with reactivated OSC failed" rm -f $DIR/$tfile -- 1.8.3.1