RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: allow sub for monmap

Browse Source
This commit is contained in:
Sage Weil 2009-09-21 14:45:45 -07:00
parent c2c9ecd1dd
commit 98e6da670f
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/MonMap.h
View File

@ -39,6 +39,8 @@ class MonMap {
return mon_inst.size();
}
epoch_t get_epoch() { return epoch; }
void add_mon(entity_inst_t inst) {
mon_inst.push_back(inst);
}

38
src/mon/Monitor.cc
View File

@ -494,6 +494,8 @@ void Monitor::handle_subscribe(MMonSubscribe *m)
mdsmon()->check_sub(s->sub_map["mdsmap"]);
else if (p->first == "osdmap")
osdmon()->check_sub(s->sub_map["osdmap"]);
else if (p->first == "monmap")
check_sub(s->sub_map["monmap"]);
}
// ???
@ -518,12 +520,42 @@ bool Monitor::ms_handle_reset(Connection *con, const entity_addr_t& peer)
return true;
}
void Monitor::check_subs()
{
nstring type = "monmap";
xlist<Subscription*>::iterator p = session_map.subs[type].begin();
while (!p.end()) {
Subscription *sub = *p;
++p;
check_sub(sub);
}
}
void Monitor::check_sub(Subscription *sub)
{
if (sub->last < monmap->get_epoch()) {
send_latest_monmap(sub->session->inst);
if (sub->onetime)
session_map.remove_sub(sub);
else
sub->last = monmap->get_epoch();
}
}
// -----
void Monitor::send_latest_monmap(entity_inst_t i)
{
bufferlist bl;
monmap->encode(bl);
messenger->send_message(new MMonMap(bl), i);
}
void Monitor::handle_mon_get_map(MMonGetMap *m)
{
dout(10) << "handle_mon_get_map" << dendl;
bufferlist bl;
monmap->encode(bl);
messenger->send_message(new MMonMap(bl), m->get_orig_source_inst());
send_latest_monmap(m->get_orig_source_inst());
delete m;
}

4
src/mon/Monitor.h
View File

@ -131,6 +131,10 @@ public:
// -- sessions --
SessionMap session_map;
void check_subs();
void check_sub(Subscription *sub);
void send_latest_monmap(entity_inst_t i);
// messages