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>
This commit is contained in:
Sage Weil 2013-07-25 13:54:20 -07:00
parent 5796d763a4
commit 77ee5a0714

View File

@ -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):