From: tamil Date: Tue, 23 Sep 2014 14:50:49 +0000 (-0700) Subject: included an option to ceph_objectstore_tool, whenever we have keyvaluestore_backend... X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa6ce9b7161d0ab3b6fb5eff383fa7fdff13ae56;p=ceph.git included an option to ceph_objectstore_tool, whenever we have keyvaluestore_backend as a configurable parameter Signed-off-by: tamil (cherry picked from commit a5a1cce3c768df18436fec795b19f5b4e7899cac) --- diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index 007f446b37d..f473fa6bece 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -129,7 +129,10 @@ class Thrasher: if len(self.dead_osds) > 1 and random.random() < self.chance_move_pg: exp_osd = random.choice(self.dead_osds[:-1]) (exp_remote,) = self.ceph_manager.ctx.cluster.only('osd.{o}'.format(o=exp_osd)).remotes.iterkeys() - prefix = "sudo ceph_objectstore_tool --data-path {fpath} --journal-path {jpath} ".format(fpath=FSPATH, jpath=JPATH) + if 'keyvaluestore_backend' in self.ceph_manager.ctx.ceph.conf['osd']: + prefix = "sudo ceph_objectstore_tool --data-path {fpath} --journal-path {jpath} --type keyvaluestore-dev ".format(fpath=FSPATH, jpath=JPATH) + else: + prefix = "sudo ceph_objectstore_tool --data-path {fpath} --journal-path {jpath} ".format(fpath=FSPATH, jpath=JPATH) cmd = (prefix + "--op list-pgs").format(id=exp_osd) proc = exp_remote.run(args=cmd, wait=True, check_status=True, stdout=StringIO()) if proc.exitstatus: