]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()
authorNeha Ojha <nojha@redhat.com>
Sat, 31 Aug 2019 01:15:58 +0000 (18:15 -0700)
committerNathan Cutler <ncutler@suse.com>
Sun, 15 Dec 2019 15:54:14 +0000 (16:54 +0100)
commit8ba6679b72bf16d9be9bf87849a9179e79cb35f4
tree699264d0e0d74a8d94bc3da76b9ba41b2ab5ed6d
parentaf44984f8284e07aafe881f06a1827d9e2e2f30c
osd/MissingLoc, PeeringState: remove osd from missing loc in purge_strays()

We should always try to keep osds in missing_loc consistent with peer_missing
and peer_info. When we remove an osd from peer_missing and peer_info, we
should also remove it from missing_loc during purging strays.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 624ade487ea4aeaf988cc1767e0b293f76addd5b)

Conflicts:
src/osd/MissingLoc.cc
src/osd/MissingLoc.h
src/osd/PeeringState.cc
- these files do not exist in luminous; made the changes manually to
  src/osd/PG.cc and src/osd/PG.h
- ldout(cct, ...) -> ldout(pg->cct, ...)
src/osd/PG.cc
src/osd/PG.h