From ece7098f341ce2cef798610d6e17c5fbbb7dd47d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 1 Jul 2010 12:07:35 -0700 Subject: [PATCH] osd: pgpool keeps pool name --- src/osd/OSD.cc | 2 +- src/osd/PG.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index a61884d583458..8bdc7a746bcdf 100644 --- 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 d4e4504183af5..b2c12c3436465 100644 --- 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 cached_removed_snaps; // current removed_snaps set interval_set 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() { -- 2.39.5