From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Dec 2013 06:15:54 +0000 (-0800)
Subject: crush/CrushWrapper: default to the "new" bobtail-era tunables
X-Git-Tag: v0.74~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F888%2Fhead;p=ceph.git

crush/CrushWrapper: default to the "new" bobtail-era tunables

These are supported as of kernel version v3.9:
 - chooseleaf_descend_once was added in 1604f48
 - others were added in 546f04e

And of course these are supported by bobtail and later.

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

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 72ad52e2c72..5d700147c1a 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -106,20 +106,21 @@ public:
     crush->choose_total_tries = 19;
     crush->chooseleaf_descend_once = 0;
   }
-  void set_tunables_optimal() {
+  void set_tunables_argonaut() {
+    set_tunables_legacy();
+  }
+  void set_tunables_bobtail() {
     crush->choose_local_tries = 0;
     crush->choose_local_fallback_tries = 0;
     crush->choose_total_tries = 50;
     crush->chooseleaf_descend_once = 1;
   }
-  void set_tunables_argonaut() {
-    set_tunables_legacy();
-  }
-  void set_tunables_bobtail() {
-    set_tunables_optimal();
+
+  void set_tunables_optimal() {
+    set_tunables_bobtail();
   }
   void set_tunables_default() {
-    set_tunables_legacy();
+    set_tunables_bobtail();
   }
 
   int get_choose_local_tries() const {