Whamcloud - gitweb
LU-12350 tests: Do not use background failover 85/34985/2
authorPatrick Farrell <pfarrell@whamcloud.com>
Tue, 28 May 2019 21:02:49 +0000 (17:02 -0400)
committerOleg Drokin <green@whamcloud.com>
Sat, 1 Jun 2019 03:55:45 +0000 (03:55 +0000)
For some reason, test 33 chooses at one point to take an
OST offline by starting failover in the background. It
seems to assume the OST will be offline during the
subsequent read, without doing anything to verify it is
offline - In fact, it could either be not offline yet or
back online with failover complete.

Just use stop like the rest of the test does.

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I9c074ff1412793b8f0d8f15dc1e2ee21bb6d9fd6
Reviewed-on: https://review.whamcloud.com/34985
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/sanity-flr.sh

index fb94b57..33732e3 100644 (file)
@@ -1064,10 +1064,8 @@ test_33() {
        start_osts 1
 
        # read file again with ost2 failed
        start_osts 1
 
        # read file again with ost2 failed
-       $LCTL set_param ldlm.namespaces.lustre-*-osc-[-0-9a-f]*.lru_size=clear
-
-       fail ost2 &
-       sleep 1
+       stop_osts 2
+       drop_client_cache
 
        # check size, glimpse should work
        $CHECKSTAT -t file -s $fsize $DIR/$tfile ||
 
        # check size, glimpse should work
        $CHECKSTAT -t file -s $fsize $DIR/$tfile ||
@@ -1078,7 +1076,7 @@ test_33() {
        [[ "$rs" == "ost1" ]] ||
                error "file content error: expected: \"ost1\", actual: \"$rs\""
 
        [[ "$rs" == "ost1" ]] ||
                error "file content error: expected: \"ost1\", actual: \"$rs\""
 
-       wait_osc_import_ready client ost2
+       start_osts 2
 }
 run_test 33 "read can choose available mirror to read"
 
 }
 run_test 33 "read can choose available mirror to read"