From feecacfb34dfd831291fc736ea39dbcf69e7d765 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 18 May 2015 20:08:14 -0700 Subject: [PATCH] ceph-objectstore-tool: Add dump-journal as not requiring --pgid in usage Additional comment describes --pgid requirement checking Signed-off-by: David Zafman (cherry picked from commit bd2f62445be7153a9600bcf4399e8fc56f1efd3f) --- src/tools/ceph_objectstore_tool.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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(&jpath), "path to journal, mandatory for filestore type") ("pgid", po::value(&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(&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(&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)) { -- 2.47.3