mon: add pool name to prepare_pool_crush_ruleset

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9c7df9bde238853cbf063051db7e380f6ab5209a..e4f527bdc1303964246fbe184aa4736bc94bfae4 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2988,7 +2988,8 @@ int OSDMonitor::prepare_pool_stripe_width(const unsigned pool_type,
   return err;
 }
 
-int OSDMonitor::prepare_pool_crush_ruleset(const unsigned pool_type,
+int OSDMonitor::prepare_pool_crush_ruleset(const string &poolstr,
+                                          const unsigned pool_type,
                                           const map<string,string> &properties,
                                           int *crush_ruleset,
                                           stringstream &ss)
@@ -3059,7 +3060,8 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, int crush_ruleset,
   int r = prepare_pool_properties(pool_type, properties, &properties_map, ss);
   if (r)
     return r;
-  r = prepare_pool_crush_ruleset(pool_type, properties_map, &crush_ruleset, ss);
+  r = prepare_pool_crush_ruleset(name, pool_type, properties_map,
+                                &crush_ruleset, ss);
   if (r)
     return r;
   unsigned size;

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 4734549f6347810ec5d3ee8711df4be1655055fc..a4094aee12122f7509a8e3474efaf0ab5d02ef1c 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -251,7 +251,8 @@ private:
                              const vector<string> &properties,
                              map<string,string> *properties_map,
                              stringstream &ss);
-  int prepare_pool_crush_ruleset(const unsigned pool_type,
+  int prepare_pool_crush_ruleset(const string &poolstr,
+                                const unsigned pool_type,
                                 const map<string,string> &properties,
                                 int *crush_ruleset,
                                 stringstream &ss);