Skip to content
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

vendor: bump etcd/raft to pick up memory usage fix #27009

Merged
merged 1 commit into from
Jul 19, 2018

Conversation

tbg
Copy link
Member

@tbg tbg commented Jun 27, 2018

Pick up etcd-io/etcd#9887, which avoids pulling
the uncommitted portion of the Raft log into memory.

Release note (bug fix): Alleviate a scenario in which a large number of
uncommitted Raft commands could cause memory pressure at startup time.

@tbg tbg requested a review from a team June 27, 2018 10:45
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg tbg requested a review from bdarnell June 27, 2018 10:45
@tbg
Copy link
Member Author

tbg commented Jun 27, 2018

@bdarnell I looked through the changes that we picked up here and they didn't seem worrisome, but still - how proactive do we want to be about putting this on release-2.0?

@bdarnell
Copy link
Contributor

LGTM

There's a typo in the commit message: we're picking up etcd-io/etcd#9887.

I was planning to do a cherry-pick for release-2.0 today.

craig bot pushed a commit that referenced this pull request Jun 28, 2018
27024: release-2.0: cherry-pick etcd-io/etcd#9887 r=tschottdorf a=bdarnell

This is the release-2.0 counterpart to #27009.

Release note (bug fix): Alleviate a scenario in which a large number of
uncommitted Raft commands could cause memory pressure at startup time.

Co-authored-by: Ben Darnell <ben@cockroachlabs.com>
@tbg tbg force-pushed the bump-etcd branch 2 times, most recently from dd5418a to e4928e7 Compare June 28, 2018 06:49
@tbg
Copy link
Member Author

tbg commented Jun 28, 2018

TFTR. Commit message and PR title fixed.

bors r=bdarnell

@craig
Copy link
Contributor

craig bot commented Jun 28, 2018

Timed out

Pick up etcd-io/etcd#9887, which avoids pulling the uncommitted portion
of the Raft log into memory.

Release note (bug fix): Alleviate a scenario in which a large number of
uncommitted Raft commands could cause memory pressure at startup time.
@tbg
Copy link
Member Author

tbg commented Jul 19, 2018

Rebased.
bors r=bdarnell

craig bot pushed a commit that referenced this pull request Jul 19, 2018
27009: vendor: bump etcd/raft to pick up memory usage fix r=bdarnell a=tschottdorf

Pick up etcd-io/etcd#9887, which avoids pulling
the uncommitted portion of the Raft log into memory.

Release note (bug fix): Alleviate a scenario in which a large number of
uncommitted Raft commands could cause memory pressure at startup time.

Co-authored-by: Tobias Schottdorf <tobias.schottdorf@gmail.com>
@craig
Copy link
Contributor

craig bot commented Jul 19, 2018

Build succeeded

@craig craig bot merged commit b8d5cd0 into cockroachdb:master Jul 19, 2018
@bdarnell
Copy link
Contributor

So we put this in 2.0.4 but never merged it to master? Oops.

@tbg tbg deleted the bump-etcd branch July 19, 2018 13:34
@tbg
Copy link
Member Author

tbg commented Jul 19, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants