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

mon/Monitor.cc: notify_new_monmap() skips removal of non-exist rank

Browse Source 
Problem:
In RHCS the user can choose to manually remove a monitor rank
before shutting the monitor down. Causing inconsistency in monmap.
for example we remove mon.a from the monmap, there is a short period
where mon.a is still operational and will try to remove itself from
monmap but we will run into an assertion in
ConnectionTracker::notify_ranks_removed().

Solution:
In Monitor::notify_new_monmap() we prevent the func
from going into removing our own rank, or
ranks that doesn't exists in monmap.

FYI: this is an RHCS problem only, in ODF,
we never remove a monitor from monmap
before shutting it down.

Fixes: https://tracker.ceph.com/issues/58049

Signed-off-by: Kamoltat <ksirivad@redhat.com>
This commit is contained in:
Kamoltat 2022-12-14 19:54:00 +00:00
parent 4d8b0c29bf
commit 924e7ec92b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mon/Monitor.cc
View File

@ -6624,10 +6624,19 @@ void Monitor::notify_new_monmap(bool can_change_external_state, bool remove_rank
dout(10) << __func__ << " we have " << monmap->removed_ranks.size() << " removed ranks" << dendl;
for (auto i = monmap->removed_ranks.rbegin();
i != monmap->removed_ranks.rend(); ++i) {
int rank = *i;
dout(10) << __func__ << " removing rank " << rank << dendl;
int remove_rank = *i;
dout(10) << __func__ << " removing rank " << remove_rank << dendl;
if (rank == remove_rank) {
dout(5) << "We are removing our own rank, probably we"
<< " are removed from monmap before we shutdown ... dropping." << dendl;
continue;
}
int new_rank = monmap->get_rank(messenger->get_myaddrs());
elector.notify_rank_removed(rank, new_rank);
if (new_rank == -1) {
dout(5) << "We no longer exists in the monmap! ... dropping." << dendl;
continue;
}
elector.notify_rank_removed(remove_rank, new_rank);
}
}