From: Sage Weil <sage@inktank.com>
Date: Sat, 7 Dec 2013 00:20:23 +0000 (-0800)
Subject: crushtool: remove scary tunables messages
X-Git-Tag: v0.74~20^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8535ceda0350fcf312a6865ad0fc3a843d55f2ef;p=ceph.git

crushtool: remove scary tunables messages

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

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index caebf2d56207..d8e758506e2e 100644
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -668,34 +668,18 @@ int main(int argc, const char **argv)
     "** tunables are DANGEROUS and NOT YET RECOMMENDED.  DO NOT USE without\n"
     "** confirming with developers that your use-case is safe and correct.";
   if (choose_local_tries >= 0) {
-    if (!unsafe_tunables) {
-      cerr << scary_tunables_message << std::endl;
-      return -1;
-    }
     crush.set_choose_local_tries(choose_local_tries);
     modified = true;
   }
   if (choose_local_fallback_tries >= 0) {
-    if (!unsafe_tunables) {
-      cerr << scary_tunables_message << std::endl;
-      return -1;
-    }
     crush.set_choose_local_fallback_tries(choose_local_fallback_tries);
     modified = true;
   }
   if (choose_total_tries >= 0) {
-    if (!unsafe_tunables) {
-      cerr << scary_tunables_message << std::endl;
-      return -1;
-    }
     crush.set_choose_total_tries(choose_total_tries);
     modified = true;
   }
   if (chooseleaf_descend_once >= 0) {
-    if (!unsafe_tunables) {
-      cerr << scary_tunables_message << std::endl;
-      return -1;
-    }
     crush.set_chooseleaf_descend_once(chooseleaf_descend_once);
     modified = true;
   }