From: David Zafman <dzafman@redhat.com>
Date: Wed, 6 Dec 2017 01:53:01 +0000 (-0800)
Subject: ceph-objectstore-tool: Improve ceph-objectstore-tool usage output
X-Git-Tag: v12.2.3~36^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=faef2777ffe0c6548616f1691c72470096e96fb4;p=ceph.git

ceph-objectstore-tool: Improve ceph-objectstore-tool usage output

Remove unused argument test-align

Caused by: 1c8731c31eb53e17d8f363906438963ab5688fe0

Positional arguments are described by usage() because
the parsing code creates descriptions like "--object" for the
object positional argument.

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 68ce195b90a..4d6318942a9 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -296,7 +296,6 @@ ghobject_t biginfo_oid;
 int file_fd = fd_none;
 bool debug;
 super_header sh;
-uint64_t testalign;
 
 static int get_fd_data(int fd, bufferlist &bl)
 {
@@ -2569,10 +2568,9 @@ int main(int argc, char **argv)
     ("objcmd", po::value<string>(&objcmd), "command [(get|set)-bytes, (get|set|rm)-(attr|omap), (get|set)-omaphdr, list-attrs, list-omap, remove]")
     ("arg1", po::value<string>(&arg1), "arg1 based on cmd")
     ("arg2", po::value<string>(&arg2), "arg2 based on cmd")
-    ("test-align", po::value<uint64_t>(&testalign)->default_value(0), "hidden align option for testing")
     ;
 
-  po::options_description all("All options");
+  po::options_description all;
   all.add(desc).add(positional);
 
   po::positional_options_description pd;
@@ -2593,7 +2591,7 @@ int main(int argc, char **argv)
   }
 
   if (vm.count("help")) {
-    usage(all);
+    usage(desc);
     return 1;
   }