From: Loic Dachary <loic@dachary.org>
Date: Sun, 8 Dec 2013 18:45:28 +0000 (+0100)
Subject: crush: --show-utilization* implies --show-statistics
X-Git-Tag: v0.74~12^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41152a6317d288c661e4e1d8e4307d375178e067;p=ceph.git

crush: --show-utilization* implies --show-statistics

--show-utilization* outputs only if --show-statistics is set, which is
confusing. Instead of failing, set --show-statistics to avoid the
confusion.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index e903fb6b1bdb..7ae9bae6618c 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -703,6 +703,10 @@ int main(int argc, const char **argv)
   }
 
   if (test) {
+    if (tester.get_output_utilization_all() ||
+	tester.get_output_utilization())
+      tester.set_output_statistics(true);
+
     int r = tester.test();
     if (r < 0)
       exit(1);