-
Notifications
You must be signed in to change notification settings - Fork 9.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[3.5] Backport fix tx buffer inconsistency if there are unordered key writes in one tx #18861
base: release-3.5
Are you sure you want to change the base?
[3.5] Backport fix tx buffer inconsistency if there are unordered key writes in one tx #18861
Conversation
/retest |
Hi @wenjiaswe, as the bot suggested, could you please take a look at the backport PR? |
3555f72
to
c7b58bc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Could you please also backport the fix to 3.4 and update both 3.5 and 3.4 changelog?
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ahrtr, chaochn47 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this PR comes with enough tests to feel safe. Testing just dedup
function is not enough to ensure there is no regression with the backport. Code differences should make us even more careful and ensure the change is tested instead of removing tests if it's not convenient.
Correctly me if I'm wrong but If I remember correctly, the fix isn't for a user visible bug, as the issue is internal and requires other changes that were done on main branch to be visible. This means we should not rush this backport.
/retitle [3.5] Backport fix tx buffer inconsistency if there are unordered key writes in one tx |
…ere are unordered key writes in one tx. etcd-io#17263 Notes: 1. batch_tx_test.go is not incorporated into this backport because main and release-3.5 diverges a lot on buckets/schema/etc.. It is also not the core of the bug fix. 2. verify in tx_buffer.go is removed as mainly due to the dependency is not there in relese-3.5. Signed-off-by: Chao Chen <chaochn@amazon.com>
c7b58bc
to
fc2db8e
Compare
Thanks for catching this. Just realized replacing
Hi @serathius could you please elaborate what the other change is in main branch that was disclosing this bug? Is it because another NEW key value was written into the non-key buckets without proper lexicographical order?
Agreed. Safety of correctness is the key for release branches. Could you please suggest what additional safeguard / testing coverage we should have before committing this back port? |
/retest |
Fix tx buffer inconsistency if there are unordered key writes in one tx.
This bug fix seems like an important one we need to get into release branch in #18846.
WDTY? @ahrtr @serathius @fuweid @ivanvc
Notes:
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.