tools/crushtool: add straw2 support for help message

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 6448ea283b4e1519682ecb29f18fbb767752d496)

diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index e5ead0824053ebb665015e430d467c77c1be5e4b..7edb3afe317e05bee76dc8a8b7df713b5ce2c0e3 100755 (executable)
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -26,7 +26,7 @@
                            compile with unsafe tunables
      --build --num_osds N layer1 ...
                            build a new map, where each 'layer' is
-                           'name (uniform|straw|list|tree) size'
+                           'name (uniform|straw2|straw|list|tree) size'
   
   Options for the tunables adjustments stage
   

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 7e0438972c59782a5935608aafa50ccc3193bbff..b1f5aaabf42b1e71d04979c71e24a62a9ce2e9a2 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -132,7 +132,7 @@ void usage()
   cout << "                         compile with unsafe tunables\n";
   cout << "   --build --num_osds N layer1 ...\n";
   cout << "                         build a new map, where each 'layer' is\n";
-  cout << "                         'name (uniform|straw|list|tree) size'\n";
+  cout << "                         'name (uniform|straw2|straw|list|tree) size'\n";
   cout << "\n";
   cout << "Options for the tunables adjustments stage\n";
   cout << "\n";