ceph_manager: try both new and old tell mon.* syntax

So we can test old code with new teuthology (e.g., upgrade testing)

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 92c6c52941a264cb098ed3729676c93fca7c459d..60ab49efe69488cc1d3ffa3fbb513adaf112c849 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -36,8 +36,13 @@ class Thrasher:
         if self.config is None:
             self.config = dict()
         # prevent monitor from auto-marking things out while thrasher runs
-        manager.raw_cluster_cmd('--', 'tell', 'mon.*', 'injectargs',
-                                '--mon-osd-down-out-interval', '0')
+        # try both old and new tell syntax, in case we are testing old code
+        try:
+            manager.raw_cluster_cmd('--', 'tell', 'mon.*', 'injectargs',
+                                    '--mon-osd-down-out-interval', '0')
+        except:
+            manager.raw_cluster_cmd('--', 'mon', 'tell', '*', 'injectargs',
+                                    '--mon-osd-down-out-interval', '0')
         self.thread = gevent.spawn(self.do_thrash)
 
     def kill_osd(self, osd=None):