]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: modify TEST_recovery_sizeup() to handle async recovery
authorNeha Ojha <nojha@redhat.com>
Tue, 27 Feb 2018 18:37:56 +0000 (10:37 -0800)
committerNeha Ojha <nojha@redhat.com>
Thu, 15 Mar 2018 18:13:34 +0000 (11:13 -0700)
Signed-off-by: Neha Ojha <nojha@redhat.com>
qa/standalone/osd/osd-recovery-stats.sh

index 0c0666bd4aa4f5fc20f7a2aedb4fa040a931e8c7..f2080af7454b0f916f309368f96091e5427b28c8 100755 (executable)
@@ -211,14 +211,14 @@ function TEST_recovery_sizeup() {
     ceph osd out osd.$primary osd.$otherosd
     ceph osd pool set test size 4
     ceph osd unset norecover
-    ceph tell osd.$(get_primary $poolname obj1) debug kick_recovery_wq 0
+    # Get new primary
+    primary=$(get_primary $poolname obj1)
+
+    ceph tell osd.${primary} debug kick_recovery_wq 0
     sleep 2
 
     wait_for_clean || return 1
 
-    # Get new primary
-    primary=$(get_primary $poolname obj1)
-
     local degraded=$(expr $objects \* 2)
     local misplaced=$(expr $objects \* 2)
     local log=$dir/osd.${primary}.log