RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

LogClient: pass in CephContext explicitly

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

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
This commit is contained in:
Colin Patrick McCabe 2011-06-09 18:04:39 -07:00
parent 03aef0b67f
commit 4e0ddae48f
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/LogClient.cc
View File

@ -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)
{

3
src/common/LogClient.h
View File

@ -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);

2
src/mds/MDS.cc
View File

@ -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;

2
src/mon/Monitor.cc
View File

@ -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),

2
src/osd/OSD.cc
View File

@ -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),