LogClient: pass in CephContext explicitly

Again, the Messenger passed to LogClient may be NULL, so pass in the
CephContext explicitly.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/LogClient.cc b/src/common/LogClient.cc
index 865f932d5d04ebf3f92135f85a2fd4669216ed93..eabd5a14a27f074b923698bb4403c531fdeb4819 100644 (file)
--- a/src/common/LogClient.cc
+++ b/src/common/LogClient.cc
@@ -60,8 +60,9 @@ static inline int clog_type_to_syslog_prio(clog_type t)
   }
 }
 
-LogClient::LogClient(Messenger *m, MonMap *mm, MonClient *mc, enum logclient_flag_t flags) :
-    Dispatcher(m->cct),
+LogClient::LogClient(CephContext *cct, Messenger *m, MonMap *mm,
+                    MonClient *mc, enum logclient_flag_t flags) :
+    Dispatcher(cct),
     messenger(m), monmap(mm), monc(mc), is_mon(flags & FLAG_MON),
     log_lock("LogClient::log_lock"), last_log_sent(0), last_log(0)
 {

diff --git a/src/common/LogClient.h b/src/common/LogClient.h
index 3b3997a7298341e429c2e7ada5a9010c70baddd5..f839518362172cc34f5c90471bb0869eeee8f1c9 100644 (file)
--- a/src/common/LogClient.h
+++ b/src/common/LogClient.h
@@ -56,7 +56,8 @@ public:
     FLAG_MON = 0x1,
   };
 
-  LogClient(Messenger *m, MonMap *mm, MonClient *mc, enum logclient_flag_t flags);
+  LogClient(CephContext *cct, Messenger *m, MonMap *mm,
+           MonClient *mc, enum logclient_flag_t flags);
 
   void handle_log_ack(MLogAck *m);
 

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 15018a5076341615e51cee5c4344c724810e1db1..10977118c120e824b68a6a0b6f9b76eb9b9c0cb8 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -95,7 +95,7 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) :
   standby_replaying(false),
   messenger(m),
   monc(mc),
-  clog(messenger, &mc->monmap, mc, LogClient::NO_FLAGS),
+  clog(m->cct, messenger, &mc->monmap, mc, LogClient::NO_FLAGS),
   sessionmap(this) {
 
   orig_argc = 0;

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 7606defb4fa4c30dadbb0ceea00a5040de6e05b1..b727069e503c11b1ebf4d4076d52ca5d1bcc503e 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -93,7 +93,7 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorStore *s, Messenger *m, Mo
   lock("Monitor::lock"),
   timer(lock),
   monmap(map),
-  clog(messenger, monmap, NULL, LogClient::FLAG_MON),
+  clog(cct_, messenger, monmap, NULL, LogClient::FLAG_MON),
   store(s),
   
   state(STATE_STARTING), stopping(false),

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0b3411af13d9c651dc1e53f71b3d0ecd622e3529..c2ccfb5bd534b9f324f00989e5032aace0b76c88 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -409,7 +409,7 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger,
   logger(NULL), logger_started(false),
   store(NULL),
   map_in_progress(false),
-  clog(client_messenger, &mc->monmap, mc, LogClient::NO_FLAGS),
+  clog(hbm->cct, client_messenger, &mc->monmap, mc, LogClient::NO_FLAGS),
   whoami(id),
   dev_path(dev), journal_path(jdev),
   dispatch_running(false),