From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Feb 2015 15:43:46 +0000 (-0800)
Subject: crushtool: do not dump tree on build
X-Git-Tag: suse_latest~26^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f52840c8a986946af2f735e6eab6d5659ab084fa;p=ceph.git

crushtool: do not dump tree on build

This pollutes the output.

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 4b98b3cbaff0..16af49044aeb 100644
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -4,21 +4,6 @@
 # display the crush tree by default
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 root straw 0
-  .* (re)
-  ID\tWEIGHT\tTYPE NAME (esc)
-  -7\t5.00000\troot root (esc)
-  -4\t2.00000\t\track rack0 (esc)
-  -1\t2.00000\t\t\tnode node0 (esc)
-  0\t1.00000\t\t\t\tosd.0 (esc)
-  1\t1.00000\t\t\t\tosd.1 (esc)
-  -5\t2.00000\t\track rack1 (esc)
-  -2\t2.00000\t\t\tnode node1 (esc)
-  2\t1.00000\t\t\t\tosd.2 (esc)
-  3\t1.00000\t\t\t\tosd.3 (esc)
-  -6\t1.00000\t\track rack2 (esc)
-  -3\t1.00000\t\t\tnode node2 (esc)
-  4\t1.00000\t\t\t\tosd.4 (esc)
-  
 
 #  
 # silence all messages with --debug-crush 0
@@ -29,20 +14,6 @@
 # display a warning if there is more than one root
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 
-  .* (re)
-  ID\tWEIGHT\tTYPE NAME (esc)
-  -6\t1.00000\track rack2 (esc)
-  -3\t1.00000\t\tnode node2 (esc)
-  4\t1.00000\t\t\tosd.4 (esc)
-  -5\t2.00000\track rack1 (esc)
-  -2\t2.00000\t\tnode node1 (esc)
-  2\t1.00000\t\t\tosd.2 (esc)
-  3\t1.00000\t\t\tosd.3 (esc)
-  -4\t2.00000\track rack0 (esc)
-  -1\t2.00000\t\tnode node0 (esc)
-  0\t1.00000\t\t\tosd.0 (esc)
-  1\t1.00000\t\t\tosd.1 (esc)
-  
   .* The crush rulesets will use the root rack0 (re)
   and ignore the others.
   There are 3 roots, they can be
diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index f894c1f5b052..f66e820aa3e8 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -615,12 +615,6 @@ int main(int argc, const char **argv)
       lower_weights.swap(cur_weights);
     }
 
-    {
-      ostringstream oss;
-      crush.dump_tree(&oss, NULL);
-      dout(1) << "\n" << oss.str() << dendl;
-    }
-
     string root = layers.back().size == 0 ? layers.back().name :
       string(layers.back().name) + "0";