Merge pull request #6824 from Sandy4999/wip-crushtool-build

crushtool: set type 0 name "device" for --build option Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Dec 31, 2015 · a67f873 · a67f873
2 parents d5b9767 + 4269263
commit a67f873
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
@@ -215,7 +215,7 @@ int CrushCompiler::decompile(ostream &out)
   for (int i=0; n; i++) {
     const char *name = crush.get_type_name(i);
     if (!name) {
-      if (i == 0) out << "type 0 device\n";
+      if (i == 0) out << "type 0 osd\n";
       continue;
     }
     n--;

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
@@ -79,7 +79,7 @@
   device 24 osd.24
 
   # types
-  type 0 device
+  type 0 osd
   type 1 node
   type 2 rack
   type 3 root

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
@@ -36,7 +36,7 @@
   device 0 osd.0
 
   # types
-  type 0 device
+  type 0 osd
   type 1 root
 
   # buckets

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
@@ -623,6 +623,7 @@ int main(int argc, const char **argv)
       crush.set_item_name(i, "osd." + stringify(i));
     }
 
+    crush.set_type_name(0, "osd");
     int type = 1;
     for (vector<layer_t>::iterator p = layers.begin(); p != layers.end(); ++p, type++) {
       layer_t &l = *p;