osd: pgpool keeps pool name

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a61884d583458a7481de297fb7d94cd139512bc3..8bdc7a746bcdfab4ee1cd264c1845d1e23f1345c 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -774,7 +774,7 @@ PGPool* OSD::_get_pool(int id)
 {
   PGPool *p = _lookup_pool(id);
   if (!p) {
-    p = new PGPool(id);
+    p = new PGPool(id, osdmap->get_pool_name(id));
     pool_map[id] = p;
     p->get();
     

diff --git a/src/osd/PG.h b/src/osd/PG.h
index d4e4504183af5335fa939d7626d4c4da692c2972..b2c12c3436465dabaaf03b881d83c84a77a05a8b 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -50,6 +50,7 @@ struct PGPool {
   int id;
   atomic_t nref;
   int num_pg;
+  string name;
 
   pg_pool_t info;      
   SnapContext snapc;   // the default pool snapc, ready to go.
@@ -57,7 +58,7 @@ struct PGPool {
   interval_set<snapid_t> cached_removed_snaps;      // current removed_snaps set
   interval_set<snapid_t> newly_removed_snaps;  // newly removed in the last epoch
 
-  PGPool(int i) : id(i), num_pg(0) {}
+  PGPool(int i, const char *_name) : id(i), num_pg(0) { if (_name) name = _name; }
 
   void get() { nref.inc(); }
   void put() {