]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crushtool: remove scary tunables messages
authorSage Weil <sage@inktank.com>
Sat, 7 Dec 2013 00:20:23 +0000 (16:20 -0800)
committerSage Weil <sage@inktank.com>
Sat, 7 Dec 2013 00:24:15 +0000 (16:24 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
src/tools/crushtool.cc

index caebf2d56207e3b09b0e8056fce7fd6e9f338dfa..d8e758506e2e5ef05319b7f424b21559aaf66201 100644 (file)
@@ -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;
   }