update sources to 12.2.7

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

diff --git a/ceph/qa/tasks/osd_max_pg_per_osd.py b/ceph/qa/tasks/osd_max_pg_per_osd.py
index b4e2aa4deed452f207c0acf0752d2423e0be84c4..03ea218f5690adba4c1e2fa3093b908ddd551cc0 100644 (file)
--- a/ceph/qa/tasks/osd_max_pg_per_osd.py
+++ b/ceph/qa/tasks/osd_max_pg_per_osd.py
@@ -34,8 +34,9 @@ def test_create_from_mon(ctx, config):
     manager = ctx.managers['ceph']
     log.info('1. creating pool.a')
     pool_a = manager.create_pool_with_unique_name(pg_num)
-    manager.wait_for_clean()
-    assert manager.get_num_active_clean() == pg_num
+    pg_states = manager.wait_till_pg_convergence(300)
+    pg_created = pg_num_in_all_states(pg_states, 'active', 'clean')
+    assert pg_created == pg_num
 
     log.info('2. creating pool.b')
     pool_b = manager.create_pool_with_unique_name(pg_num)
@@ -81,8 +82,9 @@ def test_create_from_peer(ctx, config):
     manager = ctx.managers['ceph']
     log.info('1. creating pool.a')
     pool_a = manager.create_pool_with_unique_name(pg_num)
-    manager.wait_for_clean()
-    assert manager.get_num_active_clean() == pg_num
+    pg_states = manager.wait_till_pg_convergence(300)
+    pg_created = pg_num_in_all_states(pg_states, 'active', 'clean')
+    assert pg_created == pg_num
 
     log.info('2. creating pool.b')
     while True: