]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mon/OSDMonitor: fix osd_epochs insertion on prepare_beacon()
authorMatan Breizman <mbreizma@redhat.com>
Sun, 24 Dec 2023 14:16:12 +0000 (14:16 +0000)
committerMykola Golub <mgolub@suse.com>
Fri, 1 Mar 2024 11:46:31 +0000 (13:46 +0200)
commit865c1e2372b01c4232a972f733bf1eccfce65017
tree5c3842acac845d9e9790f87ee23b25fdff1b4a31
parent5f947b92b8f9114311305d42c2b8a4649cbaca03
mon/OSDMonitor: fix osd_epochs insertion on prepare_beacon()

Previously, an OSD marked out could have been added back to the map upon new beacon sent by the OSD.
If the OSD goes down (after being added back to map) - it won't be marked as OUT again.
Therefore, `osd_epochs` would remain with a "stale" OSD, as a result OSDMonitor::get_min_last_epoch_clean() will always return the "stale" OSD epoch.

When osd is marked out, it will be erased from `osd_epochs` map. Correspondingly, it should be added back to the map **only** once it's marked in.

Fixes: https://tracker.ceph.com/issues/63883
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit dd1d30b7b209eaff376620ebd6b9a65df5ee7361)
src/mon/OSDMonitor.cc