From eab3226edc8ecc6d2d93f463e019ef4eacb9f468 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 26 Nov 2014 17:26:54 +0100 Subject: [PATCH] objectstore_tool: update usage strings Signed-off-by: Loic Dachary (cherry picked from commit a90233c8b79ae6c035b5169c7f8809f853631689) Conflicts: src/tools/ceph_objectstore_tool.cc --- src/tools/ceph_objectstore_tool.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index baa7ee4d88cc2..7840c65e607df 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -1808,13 +1808,13 @@ void usage(po::options_description &desc) cerr << std::endl; cerr << "Positional syntax:" << std::endl; cerr << std::endl; - cerr << "(requires --data, --journal (for filestore type) and --pgid to be specified)" << std::endl; + cerr << "(requires --data-path, --journal-path (for filestore type) and --pgid to be specified)" << std::endl; cerr << "(optional [file] argument will read stdin or write stdout if not specified or if '-' specified)" << std::endl; cerr << "ceph-objectstore-tool ... (get|set)-bytes [file]" << std::endl; - cerr << "ceph-objectstore-tool ... (set-(attr|omap) [file]" << std::endl; - cerr << "ceph-objectstore-tool ... (set-omaphdr) [file]" << std::endl; + cerr << "ceph-objectstore-tool ... set-(attr|omap) [file]" << std::endl; cerr << "ceph-objectstore-tool ... (get|rm)-(attr|omap) " << std::endl; - cerr << "ceph-objectstore-tool ... (get-omaphdr)" << std::endl; + cerr << "ceph-objectstore-tool ... get-omaphdr" << std::endl; + cerr << "ceph-objectstore-tool ... set-omaphdr [file]" << std::endl; cerr << "ceph-objectstore-tool ... list-attrs" << std::endl; cerr << "ceph-objectstore-tool ... list-omap" << std::endl; cerr << "ceph-objectstore-tool ... remove" << std::endl; @@ -1839,7 +1839,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, list-lost, fix-lost") + "PG id, mandatory except for import, list-lost, fix-lost, list-pgs, set-allow-sharded-objects") ("op", po::value(&op), "Arg is one of [info, log, remove, export, import, list, list-lost, fix-lost, list-pgs, rm-past-intervals, set-allow-sharded-objects]") ("file", po::value(&file), @@ -1851,8 +1851,8 @@ int main(int argc, char **argv) po::options_description positional("Positional options"); positional.add_options() - ("object", po::value(&object), "ghobject in json") - ("objcmd", po::value(&objcmd), "command [(get|set)-bytes, (get|set|rm)-(attr|omap), list-attrs, list-omap, remove]") + ("object", po::value(&object), "object name or ghobject in json") + ("objcmd", po::value(&objcmd), "command [(get|set)-bytes, (get|set|rm)-(attr|omap), (get|set)-omaphdr, list-attrs, list-omap, remove]") ("arg1", po::value(&arg1), "arg1 based on cmd") ("arg2", po::value(&arg2), "arg2 based on cmd") ("test-align", po::value(&testalign)->default_value(0), "hidden align option for testing") -- 2.39.5