]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/PeeringState: fix history.same_interval_since of merge target again 36161/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 13 Jun 2020 07:28:31 +0000 (15:28 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 17 Jul 2020 16:15:20 +0000 (18:15 +0200)
commit5d9231eada9fe72506a8adffdd3df44fa2953b99
treef4969db93e13213f8dbab3047448b4d7212c985b
parent737d7af0857b3a4463c10bd503de8d5ee3af584f
osd/PeeringState: fix history.same_interval_since of merge target again

The symptom looks much like we see in
https://tracker.ceph.com/issues/37654.

The root cause is that both merge source and target could be
fabricated PGs (aka placeholders), hence merge target's
same_interval_since could remain 0 after merge.

Fix by adjusting history.same_interval_since to last_epoch_clean
reported by these PGs were found to be ready for merge.
This peer is going to be ignored/purged by primary anyway later
when peering is done.

Fixes: https://tracker.ceph.com/issues/45991
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit be5ea3a01f31b4893a823e971f452f3ccf9de001)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus; made the change manually in PG.cc
  instead
src/osd/PG.cc