]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/PeeringState: do not trim pg log past last_update_ondisk
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 12 Mar 2020 10:01:45 +0000 (18:01 +0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 7 May 2020 17:57:12 +0000 (19:57 +0200)
commitb670715eb4abeebb636120241b1e59b48130673d
tree8e68002c756ead3631cfc03fb64ee23b88d99750
parent3ad2dfa48ba6ff3b4e8104c0184b9daa42d7bc26
osd/PeeringState: do not trim pg log past last_update_ondisk

Trimming past last_update_ondisk would be really bad, e.g.,
a new interval change would cancel&redo a previous op, and if
we trim past last_update_ondisk, there could be potential
object inconsistencies as log merging won't necessarily be able
to find all divergent entries later (we lost track of the unfinished
op that should really be reverted).

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

Conflicts:
src/osd/PeeringState.cc
- changes applied manually in src/osd/PrimaryLogPG.cc
src/osd/PrimaryLogPG.cc