crush/CrushWrapper: explicitly set tunables on create, decode

Set the tunables to the 'default' values on create.

Default to the legacy values when we decode, so that an old map without
values defined gets legacy values.

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

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index d17166bc4a9fe7905e167b22e47dde8d504bc5d9..d16f766658750d719e7fb34322b4be8afc7898e0 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -828,6 +828,9 @@ void CrushWrapper::decode(bufferlist::iterator& blp)
   ::decode(crush->max_rules, blp);
   ::decode(crush->max_devices, blp);
 
+  // legacy tunables, unless we decode something newer
+  set_tunables_legacy();
+
   try {
     // buckets
     crush->buckets = (crush_bucket**)calloc(1, crush->max_buckets * sizeof(crush_bucket*));

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index b4bb67bb7429b16b2125e153391a53e291a1ca3e..72ad52e2c7278462e01ec9a3d5327154c2721b46 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -95,6 +95,8 @@ public:
     crush = crush_create();
     assert(crush);
     have_rmaps = false;
+
+    set_tunables_default();
   }
 
   // tunables