ceph_manager: count active+clean+<somjething else> as active+clean

In my case, one pg was active+clean+scrubbing.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index ea81cc3e192ffbb3c58c2939128db5bd38d382c0..1f71b8b111059ce940b0873bf322a0c16a6c0a7b 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -209,15 +209,12 @@ class CephManager:
             return int(match.group(0).split('/')[0])
 
     def get_num_active_clean(self):
-        status = self.raw_cluster_status()
-        self.log(status)
-        match = re.search(
-            "\d* active.clean",
-            status)
-        if match == None:
-            return 0
-        else:
-            return int(match.group(0).split()[0])
+        pgs = self.get_pg_stats()
+        num = 0
+        for pg in pgs:
+            if pg['state'].startswith('active+clean'):
+                num += 1
+        return num
 
     def get_num_active(self):
         pgs = self.get_pg_stats()