From: Loic Dachary <loic@dachary.org>
Date: Mon, 3 Mar 2014 14:18:34 +0000 (+0100)
Subject: mon: add pool name to prepare_pool_crush_ruleset
X-Git-Tag: v0.79~136^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32e122bdf5ea96992653511598dbd0fcfe925507;p=ceph.git

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 9c7df9bde238..e4f527bdc130 100644
--- 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 4734549f6347..a4094aee1212 100644
--- 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);