mon/OSDMonitor: tidy prefix definitions

We should define them in one place to make it easy
when updating get_store_prefixes.

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 889ac5166ad8fd30678325ddc2da59f45db53f06)
(cherry picked from commit de07d2954afb012e51d2eaca12c1763e29a19eca)
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit b29549799f4e701a017cb4f8025297b04292eecf)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8a4c5fdb1bcc56dfe9f5d4aae482da00ba65311e..3fc7054b710e4bf53d13a82b628a8237b2175b56 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -81,7 +81,8 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #define dout_subsys ceph_subsys_mon
-#define OSD_PG_CREATING_PREFIX "osd_pg_creating"
+static const string OSD_PG_CREATING_PREFIX("osd_pg_creating");
+static const string OSD_METADATA_PREFIX("osd_metadata");
 
 namespace {
 

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index baee6a894d1d92a58fe366454995a2de37786cfd..ffc486128724dc5bc1f010a21b5e4253c75c9ff3 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -43,8 +43,6 @@ class MOSDMap;
 #include "erasure-code/ErasureCodeInterface.h"
 #include "mon/MonOpRequest.h"
 
-#define OSD_METADATA_PREFIX "osd_metadata"
-
 /// information about a particular peer's failure reports for one osd
 struct failure_reporter_t {
   utime_t failed_since;     ///< when they think it failed