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
release-23.1: go.mod: cherry-pick etcd-io/raft#32 #104968
release-23.1: go.mod: cherry-pick etcd-io/raft#32 #104968
Conversation
This dependency upgrade includes a patched PR 32 from etcd-io/raft which fixes an out-of-memory scenario during election with large unapplied Raft logs. Part of cockroachdb#104402 Epic: none Release note (bug fix): Fixed a bug in upstream etcd-io/raft which could result in pulling unlimited amount of log into memory, and lead to out-of-memory situations. With the fix, the log scan has a limited memory footprint. Release justification: fixing a bug after a customer escalation
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
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.
The code looks good, but the commit is not from our fork's release-23.1 branch. Could you switch to that branch, cherry-pick the commit, and then bump to the resulting SHA? That way there won't be danger of someone putting the next cherry-pick on the correct branch and updating, which would drop this fix again.
@tbg I was intending to bump the
This shouldn't happen (at least blindly). If we have concurrent dep upgrades, both will update the SHA in
That's what I did, except the last step (yet). The alternative "optimistic" approach that you're suggesting has the risk of: we update the SHA for the first cherry-pick, the other person cherry-picks another thing on top of it; but we realize that the first cherry-pick is broken. It's too late to update the |
Not concurrent - back to back. I think you're right though, I was missing that release-23.1 is a fast-forward to cherry-pick-pr-32, so LGTM and please push after the merge. |
This dependency upgrade includes a patched PR 32 from etcd-io/raft which fixes an out-of-memory scenario during election with large unapplied Raft logs.
Part of #104402
Epic: none
Release note (bug fix): Fixed a bug in upstream etcd-io/raft which could result in pulling unlimited amount of log into memory, and lead to out-of-memory situations. With the fix, the log scan has a limited memory footprint.
Release justification: fixing a bug after a customer escalation