From 7f6f4f90fe3acc24dc18e5feba8957251e1d8879 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Tue, 27 Feb 2018 10:37:56 -0800 Subject: [PATCH] qa: modify TEST_recovery_sizeup() to handle async recovery Signed-off-by: Neha Ojha --- qa/standalone/osd/osd-recovery-stats.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/standalone/osd/osd-recovery-stats.sh b/qa/standalone/osd/osd-recovery-stats.sh index 0c0666bd4aa..f2080af7454 100755 --- a/qa/standalone/osd/osd-recovery-stats.sh +++ b/qa/standalone/osd/osd-recovery-stats.sh @@ -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 -- 2.39.5