RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Additional comment describes --pgid requirement checking

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2015-05-18 20:08:14 -07:00
parent a1de1fc20e
commit bd2f62445b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/ceph_objectstore_tool.cc
View File

@ -2535,7 +2535,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),
@ -2940,6 +2940,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)) {