]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Fix objectstore name changed to keyvaluestore
authorDavid Zafman <dzafman@redhat.com>
Thu, 8 Jan 2015 20:02:53 +0000 (12:02 -0800)
committerLoic Dachary <ldachary@redhat.com>
Tue, 13 Jan 2015 13:37:35 +0000 (14:37 +0100)
Signed-off-by: David Zafman <dzafman@redhat.com>
tasks/ceph_manager.py

index 561499568ae6710523eed1155a61e19b33b4cb9f..97f90a8ada96f9c2decf6ee510e97ecd0d7d6507 100644 (file)
@@ -174,7 +174,7 @@ class Thrasher:
                 exp_osd = random.choice(self.dead_osds[:-1])
                 (exp_remote,) = self.ceph_manager.ctx.cluster.only('osd.{o}'.format(o=exp_osd)).remotes.iterkeys()
             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 --log-file=/var/log/ceph/objectstore_tool.\\$pid.log ".format(fpath=FSPATH, jpath=JPATH)
+                prefix = "sudo ceph-objectstore-tool --data-path {fpath} --journal-path {jpath} --type keyvaluestore --log-file=/var/log/ceph/objectstore_tool.\\$pid.log ".format(fpath=FSPATH, jpath=JPATH)
             else:
                 prefix = "sudo ceph-objectstore-tool --data-path {fpath} --journal-path {jpath} --log-file=/var/log/ceph/objectstore_tool.\\$pid.log ".format(fpath=FSPATH, jpath=JPATH)
             cmd = (prefix + "--op list-pgs").format(id=exp_osd)
@@ -241,7 +241,7 @@ class Thrasher:
             FSPATH = self.ceph_manager.get_filepath()
             JPATH = os.path.join(FSPATH, "journal")
             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)
+                prefix = "sudo ceph-objectstore-tool --data-path {fpath} --journal-path {jpath} --type keyvaluestore ".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=osd)