From f326c4dcefb5fa8f2b8c4e29be4ad4c148d6e3d4 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 8 Jul 2013 17:01:06 -0700
Subject: [PATCH] mon/PGMonitor: cleanup: use const strings for pgmap prefixes

Signed-off-by: Sage Weil <sage@inktank.com>
---
 src/mon/PGMonitor.cc | 16 ++++++++--------
 src/mon/PGMonitor.h  | 15 +++++++++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index ead42a05dcae1..1cd321b684e64 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -316,7 +316,7 @@ void PGMonitor::read_pgmap_meta()
 {
   dout(10) << __func__ << dendl;
 
-  string prefix = "pgmap_meta";
+  string prefix = pgmap_meta_prefix;
 
   version_t version = mon->store->get(prefix, "version");
   epoch_t last_osdmap_epoch = mon->store->get(prefix, "last_osdmap_epoch");
@@ -358,7 +358,7 @@ void PGMonitor::read_pgmap_full()
 {
   read_pgmap_meta();
 
-  string prefix = "pgmap_pg";
+  string prefix = pgmap_pg_prefix;
   for (KeyValueDB::Iterator i = mon->store->get_iterator(prefix); i->valid(); i->next()) {
     string key = i->key();
     pg_t pgid;
@@ -371,7 +371,7 @@ void PGMonitor::read_pgmap_full()
     dout(20) << " got " << pgid << dendl;
   }
 
-  prefix = "pgmap_osd";
+  prefix = pgmap_osd_prefix;
   for (KeyValueDB::Iterator i = mon->store->get_iterator(prefix); i->valid(); i->next()) {
     string key = i->key();
     int osd = atoi(key.c_str());
@@ -403,7 +403,7 @@ void PGMonitor::apply_pgmap_delta(bufferlist& bl)
     ::decode(pgid, p);
     dout(20) << " refreshing pg " << pgid << dendl;
     bufferlist bl;
-    int r = mon->store->get("pgmap_pg", stringify(pgid), bl);
+    int r = mon->store->get(pgmap_pg_prefix, stringify(pgid), bl);
     if (r >= 0) {
       pg_map.update_pg(pgid, bl);
     } else {
@@ -418,7 +418,7 @@ void PGMonitor::apply_pgmap_delta(bufferlist& bl)
     ::decode(osd, p);
     dout(20) << " refreshing osd." << osd << dendl;
     bufferlist bl;
-    int r = mon->store->get("pgmap_osd", stringify(osd), bl);
+    int r = mon->store->get(pgmap_osd_prefix, stringify(osd), bl);
     if (r >= 0) {
       pg_map.update_osd(osd, bl);
     } else {
@@ -442,7 +442,7 @@ void PGMonitor::encode_pending(MonitorDBStore::Transaction *t)
 
   uint64_t features = mon->get_quorum_features();
 
-  string prefix = "pgmap_meta";
+  string prefix = pgmap_meta_prefix;
 
   t->put(prefix, "version", pending_inc.version);
   {
@@ -470,7 +470,7 @@ void PGMonitor::encode_pending(MonitorDBStore::Transaction *t)
   ::encode(pending_inc.stamp, incbl);
   {
     bufferlist dirty;
-    string prefix = "pgmap_pg";
+    string prefix = pgmap_pg_prefix;
     for (map<pg_t,pg_stat_t>::const_iterator p = pending_inc.pg_stat_updates.begin();
 	 p != pending_inc.pg_stat_updates.end();
 	 ++p) {
@@ -487,7 +487,7 @@ void PGMonitor::encode_pending(MonitorDBStore::Transaction *t)
   }
   {
     bufferlist dirty;
-    string prefix = "pgmap_osd";
+    string prefix = pgmap_osd_prefix;
     for (map<int32_t,osd_stat_t>::const_iterator p = pending_inc.osd_stat_updates.begin();
 	 p != pending_inc.osd_stat_updates.end();
 	 ++p) {
diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index 3f8e579fd19d4..7acd2c7d17826 100644
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -53,6 +53,10 @@ public:
 private:
   PGMap::Incremental pending_inc;
 
+  const char *pgmap_meta_prefix;
+  const char *pgmap_pg_prefix;
+  const char *pgmap_osd_prefix;
+
   void create_initial();
   void update_from_paxos(bool *need_bootstrap);
   void upgrade_format();
@@ -146,15 +150,18 @@ public:
   PGMonitor(Monitor *mn, Paxos *p, const string& service_name)
     : PaxosService(mn, p, service_name),
       need_check_down_pgs(false),
-      last_map_pg_create_osd_epoch(0)
+      last_map_pg_create_osd_epoch(0),
+      pgmap_meta_prefix("pgmap_meta"),
+      pgmap_pg_prefix("pgmap_pg"),
+      pgmap_osd_prefix("pgmap_osd")
   { }
   ~PGMonitor() { }
 
   virtual void get_store_prefixes(set<string>& s) {
     s.insert(get_service_name());
-    s.insert("pgmap_meta");
-    s.insert("pgmap_pg");
-    s.insert("pgmap_osd");
+    s.insert(pgmap_meta_prefix);
+    s.insert(pgmap_pg_prefix);
+    s.insert(pgmap_osd_prefix);
   }
 
   virtual void on_restart();
-- 
2.39.5