update sources to v12.1.2

[ceph.git] / ceph / qa / tasks / dump_stuck.py

diff --git a/ceph/qa/tasks/dump_stuck.py b/ceph/qa/tasks/dump_stuck.py
index 8da634b5d9d1e620524d52ab1935a9d8ebfc9728..39429d2c348193d1505e453a214c99af7f721989 100644 (file)
--- a/ceph/qa/tasks/dump_stuck.py
+++ b/ceph/qa/tasks/dump_stuck.py
@@ -63,6 +63,7 @@ def task(ctx, config):
 #                            '--mon-osd-report-timeout 90',
                             '--mon-pg-stuck-threshold 10')
 
+    # all active+clean
     check_stuck(
         manager,
         num_inactive=0,
@@ -76,10 +77,11 @@ def task(ctx, config):
     manager.flush_pg_stats([1])
     manager.wait_for_recovery(timeout)
 
+    # all active+clean+remapped
     check_stuck(
         manager,
         num_inactive=0,
-        num_unclean=num_pgs,
+        num_unclean=0,
         num_stale=0,
         )
 
@@ -87,6 +89,7 @@ def task(ctx, config):
     manager.flush_pg_stats([0, 1])
     manager.wait_for_clean(timeout)
 
+    # all active+clean
     check_stuck(
         manager,
         num_inactive=0,
@@ -97,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()