[
https://issues.apache.org/jira/browse/ZOOKEEPER-3127?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16612780#comment-16612780
]
Michael Han commented on ZOOKEEPER-3127:
----------------------------------------
If there is a conflict, it's expected that the author of the original PR create
a new PR targeting the new branch. If there is no conflict then committer can
cherry pick the patch to different branches. It's because the author has best
knowledge of how to deal with the conflict regardless of it's trivial or not,
plus a separate PR will test the patch again through precommit jenkins. I think
this is consistent with what committers was doing in old days when
contributions coming in as patches; it's expected the original author uploaded
a new patch to Jira if there was a conflict.
> Fixing potential data inconsistency due to update last processed zxid with
> partial multi-op txn
> -----------------------------------------------------------------------------------------------
>
> Key: ZOOKEEPER-3127
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-3127
> Project: ZooKeeper
> Issue Type: Bug
> Components: server
> Affects Versions: 3.5.4, 3.6.0, 3.4.13
> Reporter: Fangmin Lv
> Assignee: Fangmin Lv
> Priority: Critical
> Labels: pull-request-available
> Fix For: 3.6.0
>
> Time Spent: 1h 10m
> Remaining Estimate: 0h
>
> Found this issue while checking the code for another issue, this is a
> relatively rare case which we haven't seen it on prod so far.
> Currently, the lastProcessedZxid is updated when applying the first txn of
> multi-op, if there is a snapshot in progress, it's possible that the zxid
> associated with the snapshot only include partial of the multi op.
> When loading snapshot, it will only load the txns after the zxid associated
> with snapshot file, which could data inconsistency due to missing sub txns.
> To avoid this, we only update the lastProcessedZxid when the whole multi-op
> txn is applied to DataTree.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
