]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
included an option to ceph_objectstore_tool, whenever we have keyvaluestore_backend...
authortamil <tamil.muthamizhan@inktank.com>
Tue, 23 Sep 2014 14:50:49 +0000 (07:50 -0700)
committerDavid Zafman <dzafman@redhat.com>
Tue, 3 Mar 2015 21:42:06 +0000 (13:42 -0800)
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
(cherry picked from commit a5a1cce3c768df18436fec795b19f5b4e7899cac)

tasks/ceph_manager.py

index 007f446b37d5bb5ff691da8b40137dfc58293596..f473fa6bece0878f91f25528b866696bb62b6414 100644 (file)
@@ -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: