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 4332f3f68ad6eb7bcd90e3601e7ae9b5e294ce1f..85bc799f5a857971adf891c92badf46c2332ace6 100644 (file)
--- 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)) {