crushtool: --show-* instead of --output-*

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/crushtool.cc b/src/crushtool.cc
index 5ddd72f79f302f294710e25a98ce68a820922c6a..81a01c005a60a5fc106b5601fdedaca7da8ccd52 100644 (file)
--- a/src/crushtool.cc
+++ b/src/crushtool.cc
@@ -75,11 +75,12 @@ void usage()
   cout << "                         reweight a given item (and adjust ancestor\n"
        << "                         weights as needed)\n";
   cout << "   -i mapfn --reweight   recalculate all bucket weights\n";
-  cout << "   --output-utilization       output OSD usage\n";
-  cout << "   --output utilization-all   include zero weight items\n";
-  cout << "   --output-statistics        output chi squared statistics\n";
-  cout << "   --output-bad-mappings      output bad mappings\n";
-  cout << "   --output-choose-tries      output choose tries histogram\n";
+  cout << "   --show-utilization    show OSD usage\n";
+  cout << "   --show utilization-all\n";
+  cout << "                         include zero weight items\n";
+  cout << "   --show-statistics     show chi squared statistics\n";
+  cout << "   --show-bad-mappings   show bad mappings\n";
+  cout << "   --show-choose-tries   show choose tries histogram\n";
   cout << "   --set-choose-local-tries N\n";
   cout << "                         set choose local retries before re-descent\n";
   cout << "   --set-choose-local-fallback-tries N\n";
@@ -163,15 +164,15 @@ int main(int argc, const char **argv)
       outfn = val;
     } else if (ceph_argparse_flag(args, i, "-v", "--verbose", (char*)NULL)) {
       verbose = true;
-    } else if (ceph_argparse_flag(args, i, "--output_utilization", (char*)NULL)) {
+    } else if (ceph_argparse_flag(args, i, "--show_utilization", (char*)NULL)) {
       tester.set_output_utilization(true);
-    } else if (ceph_argparse_flag(args, i, "--output_utilization_all", (char*)NULL)) {
+    } else if (ceph_argparse_flag(args, i, "--show_utilization_all", (char*)NULL)) {
       tester.set_output_utilization_all(true);
-    } else if (ceph_argparse_flag(args, i, "--output_statistics", (char*)NULL)) {
+    } else if (ceph_argparse_flag(args, i, "--show_statistics", (char*)NULL)) {
       tester.set_output_statistics(true);
-    } else if (ceph_argparse_flag(args, i, "--output_bad_mappings", (char*)NULL)) {
+    } else if (ceph_argparse_flag(args, i, "--show_bad_mappings", (char*)NULL)) {
       tester.set_output_bad_mappings(true);
-    } else if (ceph_argparse_flag(args, i, "--output_choose_tries", (char*)NULL)) {
+    } else if (ceph_argparse_flag(args, i, "--show_choose_tries", (char*)NULL)) {
       tester.set_output_choose_tries(true);
     } else if (ceph_argparse_witharg(args, i, &val, "-c", "--compile", (char*)NULL)) {
       srcfn = val;

diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index 0f4e257f070f60a480c3d93b2875a71ef9d539f1..9987738e12f10b5f8cd0d660ec272bb6f1bf1607 100644 (file)
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -28,11 +28,12 @@
                            reweight a given item (and adjust ancestor
                            weights as needed)
      -i mapfn --reweight   recalculate all bucket weights
-     --output-utilization       output OSD usage
-     --output utilization-all   include zero weight items
-     --output-statistics        output chi squared statistics
-     --output-bad-mappings      output bad mappings
-     --output-choose-tries      output choose tries histogram
+     --show-utilization    show OSD usage
+     --show utilization-all
+                           include zero weight items
+     --show-statistics     show chi squared statistics
+     --show-bad-mappings   show bad mappings
+     --show-choose-tries   show choose tries histogram
      --set-choose-local-tries N
                            set choose local retries before re-descent
      --set-choose-local-fallback-tries N