From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Dec 2015 15:26:16 +0000 (-0500)
Subject: ceph-objectstore-tool: don't require journal path
X-Git-Tag: v10.0.3~154^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee01a7a662058034ace427f0d56eb13ea4460778;p=ceph.git

ceph-objectstore-tool: don't require journal path

Assume journal symlink is present.

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index e4186fbae153..5502c84b880c 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2331,9 +2331,7 @@ int main(int argc, char **argv)
     myexit(1);
   }
   if (type == "filestore" && !vm.count("journal-path")) {
-    cerr << "Must provide --journal-path" << std::endl;
-    usage(desc);
-    myexit(1);
+    jpath = dpath + "/journal";
   }
   if (!vm.count("op") && !vm.count("object")) {
     cerr << "Must provide --op or object command..." << std::endl;