tasks/cephfs: use "blacklist clear"

... instead of iterating over all blacklist entries.  Fall
back to the old way if the new way doesn't work (i.e. on
old ceph)

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/tasks/cephfs/cephfs_test_case.py b/tasks/cephfs/cephfs_test_case.py
index 29855d90d5a70d533edb2094a52d98f27b667aea..73499da7ba99cdaa6cd785babe827b3b0abf709c 100644 (file)
--- a/tasks/cephfs/cephfs_test_case.py
+++ b/tasks/cephfs/cephfs_test_case.py
@@ -127,10 +127,15 @@ class CephFSTestCase(unittest.TestCase):
 
         # In case anything is in the OSD blacklist list, clear it out.  This is to avoid
         # the OSD map changing in the background (due to blacklist expiry) while tests run.
-        blacklist = json.loads(self.fs.mon_manager.raw_cluster_cmd("osd", "dump", "--format=json-pretty"))['blacklist']
-        log.info("Removing {0} blacklist entries".format(len(blacklist)))
-        for addr, blacklisted_at in blacklist.items():
-            self.fs.mon_manager.raw_cluster_cmd("osd", "blacklist", "rm", addr)
+        try:
+            self.fs.mon_manager.raw_cluster_cmd("osd", "blacklist", "clear")
+        except CommandFailedError:
+            # Fallback for older Ceph cluster
+            blacklist = json.loads(self.fs.mon_manager.raw_cluster_cmd("osd",
+                                  "dump", "--format=json-pretty"))['blacklist']
+            log.info("Removing {0} blacklist entries".format(len(blacklist)))
+            for addr, blacklisted_at in blacklist.items():
+                self.fs.mon_manager.raw_cluster_cmd("osd", "blacklist", "rm", addr)
 
         # In case some test messed with auth caps, reset them
         client_mount_ids = [m.client_id for m in self.mounts]