From: huangjun Date: Fri, 25 Aug 2017 09:07:37 +0000 (+0800) Subject: qa: fix the potential delay of pg state change X-Git-Tag: v13.0.1~1169^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bff102d4b9608625ddbb5a3d66016ed8d9613ec;p=ceph.git qa: fix the potential delay of pg state change If start osd process first and then mark it in, the pg state may remain all active+clean when doing wait_for_clean() check, which may fail the next osd_scrub_pgs() process. So faster pg state change by marking osd in first. Signed-off-by: huangjun --- diff --git a/qa/tasks/lost_unfound.py b/qa/tasks/lost_unfound.py index 1cc588b40167..64872743b25f 100644 --- a/qa/tasks/lost_unfound.py +++ b/qa/tasks/lost_unfound.py @@ -169,8 +169,8 @@ def task(ctx, config): assert not err # see if osd.1 can cope - manager.revive_osd(1) manager.mark_in_osd(1) + manager.revive_osd(1) manager.wait_till_osd_is_up(1) manager.wait_for_clean() run.wait(procs) diff --git a/qa/tasks/rep_lost_unfound_delete.py b/qa/tasks/rep_lost_unfound_delete.py index 4e5678d08588..d24360083861 100644 --- a/qa/tasks/rep_lost_unfound_delete.py +++ b/qa/tasks/rep_lost_unfound_delete.py @@ -169,8 +169,8 @@ def task(ctx, config): assert err # see if osd.1 can cope - manager.revive_osd(1) manager.mark_in_osd(1) + manager.revive_osd(1) manager.wait_till_osd_is_up(1) manager.wait_for_clean() run.wait(procs)