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

Merge pull request #29917 from tchaikov/wip-mon-always-on-modules

Browse Source 
mgr/MgrMonitor: print pending.always_on_modules before updating it

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Kefu Chai 2019-08-29 17:31:54 +08:00 committed by GitHub
commit 48d6afb9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mon/MgrMonitor.cc
View File

@ -664,18 +664,21 @@ void MgrMonitor::cancel_timer()
void MgrMonitor::on_active()
{
if (mon->is_leader()) {
mon->clog->debug() << "mgrmap e" << map.epoch << ": " << map;
if (HAVE_FEATURE(mon->get_quorum_con_features(), SERVER_NAUTILUS) &&
pending_map.always_on_modules != always_on_modules) {
pending_map.always_on_modules = always_on_modules;
dout(4) << "always on modules changed, pending "
<< pending_map.get_always_on_modules()
<< " != wanted " << always_on_modules << dendl;
propose_pending();
}
if (!mon->is_leader()) {
return;
}
mon->clog->debug() << "mgrmap e" << map.epoch << ": " << map;
if (!HAVE_FEATURE(mon->get_quorum_con_features(), SERVER_NAUTILUS)) {
return;
}
if (pending_map.always_on_modules == always_on_modules) {
return;
}
dout(4) << "always on modules changed, pending "
<< pending_map.always_on_modules << " != wanted "
<< always_on_modules << dendl;
pending_map.always_on_modules = always_on_modules;
propose_pending();
}
void MgrMonitor::tick()