]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/PeeringState: fix history.same_interval_since of merge target again 35558/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 13 Jun 2020 07:28:31 +0000 (15:28 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 17 Jun 2020 01:14:21 +0000 (09:14 +0800)
commitbe5ea3a01f31b4893a823e971f452f3ccf9de001
treea09adbe6aa32f40ed36f1e401295d6a0eff1027d
parent8e1737097002df71ac1212a41e3deb87eb47d9f7
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>
src/osd/PeeringState.cc