From: David Zafman <dzafman@redhat.com>
Date: Tue, 19 May 2015 03:08:14 +0000 (-0700)
Subject: ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage
X-Git-Tag: v0.94.7~28^2~10^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=feecacfb34dfd831291fc736ea39dbcf69e7d765;p=ceph.git

ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage

Additional comment describes --pgid requirement checking

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit bd2f62445be7153a9600bcf4399e8fc56f1efd3f)
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 4332f3f68ad6..85bc799f5a85 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -2534,7 +2534,7 @@ int main(int argc, char **argv)
     ("journal-path", po::value<string>(&jpath),
      "path to journal, mandatory for filestore type")
     ("pgid", po::value<string>(&pgidstr),
-     "PG id, mandatory except for import, fix-lost, list-pgs, set-allow-sharded-objects")
+     "PG id, mandatory except for import, fix-lost, list-pgs, set-allow-sharded-objects, dump-journal")
     ("op", po::value<string>(&op),
      "Arg is one of [info, log, remove, export, import, list, fix-lost, list-pgs, rm-past-intervals, set-allow-sharded-objects, dump-journal]")
     ("file", po::value<string>(&file),
@@ -2939,6 +2939,10 @@ int main(int argc, char **argv)
     }
   }
 
+  // The ops which don't require --pgid option are checked here and
+  // mentioned in the usage for --pgid with some exceptions.
+  // The dump-journal op isn't here because it is handled earlier.
+  // The dump-journal-mount op is undocumented so not in the usage.
   if (op != "list" && op != "import" && op != "fix-lost"
       && op != "list-pgs"  && op != "set-allow-sharded-objects" &&
       op != "dump-journal-mount" && (pgidstr.length() == 0)) {