RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/MgrMonitor: s/digest_callback/digest_event/

Browse Source 
to be consistent with the rest of mon

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-05-16 16:41:26 +08:00
parent 5efad43ec8
commit 33494b27f7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mon/MgrMonitor.cc
View File

@ -263,7 +263,7 @@ void MgrMonitor::check_sub(Subscription *sub)
}
} else {
assert(sub->type == "mgrdigest");
if (digest_callback == nullptr) {
if (digest_event == nullptr) {
send_digests();
}
}
@ -275,7 +275,7 @@ void MgrMonitor::check_sub(Subscription *sub)
*/
void MgrMonitor::send_digests()
{
digest_callback = nullptr;
digest_event = nullptr;
const std::string type = "mgrdigest";
if (mon->session_map.subs.count(type) == 0)
@ -298,10 +298,10 @@ void MgrMonitor::send_digests()
sub->session->con->send_message(mdigest);
}
digest_callback = new C_MonContext(mon, [this](int){
digest_event = new C_MonContext(mon, [this](int){
send_digests();
});
mon->timer.add_event_after(g_conf->mon_mgr_digest_period, digest_callback);
mon->timer.add_event_after(g_conf->mon_mgr_digest_period, digest_event);
}
void MgrMonitor::on_active()
@ -538,15 +538,14 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op)
void MgrMonitor::init()
{
if (digest_callback == nullptr) {
if (digest_event == nullptr) {
send_digests(); // To get it to schedule its own event
}
}
void MgrMonitor::on_shutdown()
{
if (digest_callback) {
mon->timer.cancel_event(digest_callback);
if (digest_event) {
mon->timer.cancel_event(digest_event);
}
}

4
src/mon/MgrMonitor.h
View File

@ -36,13 +36,13 @@ class MgrMonitor : public PaxosService
void drop_active();
void drop_standby(uint64_t gid);
Context *digest_callback;
Context *digest_event = nullptr;
bool check_caps(MonOpRequestRef op, const uuid_d& fsid);
public:
MgrMonitor(Monitor *mn, Paxos *p, const string& service_name)
: PaxosService(mn, p, service_name), digest_callback(nullptr)
: PaxosService(mn, p, service_name)
{}
void init() override;