From 20507b5fc7c7ba73db256ae19ae39a7c322a7124 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 2 Dec 2013 22:15:54 -0800 Subject: [PATCH] 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 --- src/crush/CrushWrapper.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 { -- 2.47.3