From 5ec27cf589b4535f07e28a86bd304f7a46427ac4 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Tue, 26 May 2015 17:51:50 +0800
Subject: [PATCH] crushtool: rename "--check-names" to "--check"

* because "--check" also checks for the max_id

Note: edited since we do not have the fix introduced in 46103b2 in
      hammer.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9381d53acdce85fcbff828926b911e050ba36e51)
---
 src/test/cli/crushtool/check-names.max-id.t |  4 ++--
 src/test/cli/crushtool/help.t               |  3 +--
 src/tools/crushtool.cc                      | 15 +++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/test/cli/crushtool/check-names.max-id.t b/src/test/cli/crushtool/check-names.max-id.t
index 0fa5c0127369d..dab2d316f94f7 100644
--- a/src/test/cli/crushtool/check-names.max-id.t
+++ b/src/test/cli/crushtool/check-names.max-id.t
@@ -1,7 +1,7 @@
   $ crushtool -i "$TESTDIR/simple.template" --add-item 0 1.0 device0 --loc host host0 --loc cluster cluster0 -o check-names.crushmap > /dev/null
   $ crushtool -i check-names.crushmap       --add-item 1 1.0 device1 --loc host host0 --loc cluster cluster0 -o check-names.crushmap > /dev/null
-  $ crushtool -i check-names.crushmap --check-names=2
+  $ crushtool -i check-names.crushmap --check 2
   $ crushtool -i check-names.crushmap       --add-item 2 1.0 device2 --loc host host0 --loc cluster cluster0 -o check-names.crushmap > /dev/null
-  $ crushtool -i check-names.crushmap --check-names=2
+  $ crushtool -i check-names.crushmap --check 2
   item id too large: item#2
   [1]
diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index ab54bd5a5122b..9c81b7c77f792 100644
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -33,8 +33,7 @@
   
   Options for the display/test stage
   
-     --check-names max_id
-                           check if any item is referencing an unknown name/type
+     --check max_id        check if any item is referencing an unknown name/type
      -i mapfn --show-location id
                            show location for given device id
      --show-utilization    show OSD usage
diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 4881b0ae3c04e..3e36ac9870401 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -138,8 +138,7 @@ void usage()
   cout << "\n";
   cout << "Options for the display/test stage\n";
   cout << "\n";
-  cout << "   --check-names max_id\n";
-  cout << "                         check if any item is referencing an unknown name/type\n";
+  cout << "   --check max_id        check if any item is referencing an unknown name/type\n";
   cout << "   -i mapfn --show-location id\n";
   cout << "                         show location for given device id\n";
   cout << "   --show-utilization    show OSD usage\n";
@@ -196,7 +195,7 @@ int main(int argc, const char **argv)
   std::string infn, srcfn, outfn, add_name, remove_name, reweight_name;
   bool compile = false;
   bool decompile = false;
-  bool check_names = false;
+  bool check = false;
   int max_id = -1;
   bool test = false;
   bool display = false;
@@ -283,8 +282,8 @@ int main(int argc, const char **argv)
     } else if (ceph_argparse_witharg(args, i, &val, "-c", "--compile", (char*)NULL)) {
       srcfn = val;
       compile = true;
-    } else if (ceph_argparse_withint(args, i, &max_id, &err, "--check-names", (char*)NULL)) {
-      check_names = true;
+    } else if (ceph_argparse_withint(args, i, &max_id, &err, "--check", (char*)NULL)) {
+      check = true;
     } else if (ceph_argparse_flag(args, i, "-t", "--test", (char*)NULL)) {
       test = true;
     } else if (ceph_argparse_withint(args, i, &full_location, &err, "--show-location", (char*)NULL)) {
@@ -471,7 +470,7 @@ int main(int argc, const char **argv)
     }
   }
 
-  if (test && !check_name && !display && !write_to_file) {
+  if (test && !check && !display && !write_to_file) {
     cerr << "WARNING: no output selected; use --output-csv or --show-X" << std::endl;
   }
 
@@ -479,7 +478,7 @@ int main(int argc, const char **argv)
     cerr << "cannot specify more than one of compile, decompile, and build" << std::endl;
     exit(EXIT_FAILURE);
   }
-  if (!check_names && !compile && !decompile && !build && !test && !reweight && !adjust && !tree &&
+  if (!check && !compile && !decompile && !build && !test && !reweight && !adjust && !tree &&
       add_item < 0 && full_location < 0 &&
       remove_name.empty() && reweight_name.empty()) {
     cerr << "no action specified; -h for help" << std::endl;
@@ -813,7 +812,7 @@ int main(int argc, const char **argv)
     }
   }
 
-  if (check_names) {
+  if (check) {
     if (!tester.check_name_maps(max_id)) {
       exit(1);
     }
-- 
2.39.5