fix misc checks that wait for N osds to be up

These all cut&pasted broken code, blah!

diff --git a/teuthology/task/lost_unfound.py b/teuthology/task/lost_unfound.py
index 2cfc4eadc3411d982568ef3c90bec916472cc1df..09932e451a2d31d6d856c56b543da668c0f15744 100644 (file)
--- a/teuthology/task/lost_unfound.py
+++ b/teuthology/task/lost_unfound.py
@@ -40,7 +40,7 @@ def task(ctx, config):
         logger=log.getChild('ceph_manager'),
         )
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         manager.sleep(10)
     manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
     manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')

diff --git a/teuthology/task/object_source_down.py b/teuthology/task/object_source_down.py
index 89d812f7635b2e41e43f90902b182097d62f0f81..7c69f91bb14a89f135e41f678040b816182844cc 100644 (file)
--- a/teuthology/task/object_source_down.py
+++ b/teuthology/task/object_source_down.py
@@ -41,7 +41,7 @@ def task(ctx, config):
         logger=log.getChild('ceph_manager'),
         )
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         manager.sleep(10)
     manager.wait_for_clean()
 

diff --git a/teuthology/task/osd_backfill.py b/teuthology/task/osd_backfill.py
index 7660142e2d471fbb24b9299c5a2898b3895e41ec..008da1cd0131956d646af5873000e663c76376c7 100644 (file)
--- a/teuthology/task/osd_backfill.py
+++ b/teuthology/task/osd_backfill.py
@@ -45,7 +45,7 @@ def task(ctx, config):
         logger=log.getChild('ceph_manager'),
         )
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         manager.sleep(10)
     manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
     manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')

diff --git a/teuthology/task/osd_recovery.py b/teuthology/task/osd_recovery.py
index 9b52521840dacc8948dcbac8169f6f9b177f9d6d..27596b39c994f61384b2e3a203ce64b3ec555d8f 100644 (file)
--- a/teuthology/task/osd_recovery.py
+++ b/teuthology/task/osd_recovery.py
@@ -45,7 +45,7 @@ def task(ctx, config):
         logger=log.getChild('ceph_manager'),
         )
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         manager.sleep(10)
     manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
     manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')
@@ -81,9 +81,9 @@ def task(ctx, config):
     # revive divergent osd
     manager.revive_osd(2)
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         log.info('waiting a bit...')
-        manager.sleep(2)
+        time.sleep(2)
     log.info('3 are up!')
 
     # cluster must recover

diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py
index 78971daf0fa1064ad3b73d62e8447b2d1a621dc3..e0209f8303d009895f76077d62942adb58f7a114 100644 (file)
--- a/teuthology/task/peer.py
+++ b/teuthology/task/peer.py
@@ -41,7 +41,7 @@ def task(ctx, config):
         logger=log.getChild('ceph_manager'),
         )
 
-    while manager.get_osd_status()['up'] < 3:
+    while len(manager.get_osd_status()['up']) < 3:
         manager.sleep(10)
     manager.raw_cluster_cmd('tell', 'osd.0', 'flush_pg_stats')
     manager.raw_cluster_cmd('tell', 'osd.1', 'flush_pg_stats')