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.

Lustre-change: https://review.whamcloud.com/34225
Lustre-commit: 3ed6b8c2ea27b1a3a9fa073e19d77d7c317ae69f

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I826659a7f5953dee4e4551c1177479ef742b5589
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/34471
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 04d8a8a..e37e69b 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -6981,7 +6981,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 8217251..2a25d0d 100644 (file)
--- 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 e5ba62b..6b9f7f2 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8732,7 +8732,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