From 889ac5166ad8fd30678325ddc2da59f45db53f06 Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 25 Sep 2017 10:37:18 +0100 Subject: [PATCH] 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 --- src/mon/OSDMonitor.cc | 3 ++- src/mon/OSDMonitor.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 1fd2b2f9e3a..8011c6b7460 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -80,7 +80,8 @@ #include #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 ea81b6e9f18..29814df0b51 100644 --- 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 -- 2.47.3