crushtool: name osds with --build function

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

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index 16af49044aeb6fbf11ef56c20fbf3167fba3dbfd..57fb2b275f28d750c394bb57b01bc481fa5536f1 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -33,7 +33,7 @@
   tunable chooseleaf_descend_once 1
   
   # devices
-  device 0 device0
+  device 0 osd.0
   
   # types
   type 0 device
@@ -45,7 +45,7 @@
   \t# weight 1.000 (esc)
   \talg straw (esc)
   \thash 0\t# rjenkins1 (esc)
-  \titem device0 weight 1.000 (esc)
+  \titem osd.0 weight 1.000 (esc)
   }
   
   # rules

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index f66e820aa3e81cce921d0bffa9a4af91c4ffb223..12d6c7aa7b62abb4abfa18f32b1a2308c0b4795d 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -27,6 +27,7 @@
 #include "common/config.h"
 
 #include "common/ceph_argparse.h"
+#include "include/stringify.h"
 #include "global/global_context.h"
 #include "global/global_init.h"
 #include "osd/OSDMap.h"
@@ -531,11 +532,12 @@ int main(int argc, const char **argv)
     vector<int> lower_items;
     vector<int> lower_weights;
 
+    crush.set_max_devices(num_osds);
     for (int i=0; i<num_osds; i++) {
       lower_items.push_back(i);
       lower_weights.push_back(0x10000);
+      crush.set_item_name(i, "osd." + stringify(i));
     }
-    crush.set_max_devices(num_osds);
 
     int type = 1;
     for (vector<layer_t>::iterator p = layers.begin(); p != layers.end(); ++p, type++) {