From: huangjun <huangjun@xsky.com>
Date: Tue, 25 Jul 2017 11:14:07 +0000 (+0000)
Subject:   qa/tasks/dump_stuck: fix dump_stuck test bug
X-Git-Tag: v12.1.2~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16559%2Fhead;p=ceph.git

  qa/tasks/dump_stuck: fix dump_stuck test bug

  Test cluster with 2 osds, stop osd.0, if osd.1
  report the pg stats during pg peering, mon will
  record pg state to 'peering',then stop osd.1,
  finally the pg state will stuck in 'stale+peering',
  which is unexpected.

  Let's wait_for_active() after stop osd.0.

  Signed-off-by: huangjun <huangjun@xsky.com>
---

diff --git a/qa/tasks/dump_stuck.py b/qa/tasks/dump_stuck.py
index 5d467512ce1d..39429d2c3481 100644
--- a/qa/tasks/dump_stuck.py
+++ b/qa/tasks/dump_stuck.py
@@ -100,6 +100,7 @@ def task(ctx, config):
     log.info('stopping first osd')
     manager.kill_osd(0)
     manager.mark_down_osd(0)
+    manager.wait_for_active(timeout)
 
     log.info('waiting for all to be unclean')
     starttime = time.time()