]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: move down peers out from peer_purged 42240/head
authorMykola Golub <mgolub@suse.com>
Thu, 1 Jul 2021 15:52:21 +0000 (16:52 +0100)
committerMykola Golub <mgolub@suse.com>
Thu, 8 Jul 2021 06:08:27 +0000 (09:08 +0300)
commitab893cba29cddfdf0010bfb72a0e38761039c512
treee2e991c905e02737cc487fc6479bbe3046b56bd2
parent648a7753eff5cd1b581874797a950606dec9d207
osd: move down peers out from peer_purged

f7c5b01e18 tried to fix this, but adding peer_purged.erase() into
the peer_info loop made no effect because in purge_strays() when
inserting an osd to peer_purged we simultaneously remove it from
peer_info.

So it should be a separate loop through peer_purged list.

Fixes: https://tracker.ceph.com/issues/38931
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 64dc3c846ab9b1491459799ed249502599878834)

Conflicts:
src/osd/PeeringState.cc (does not exist, the code is in PG.cc)
src/osd/PG.cc