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

release-2.0: cherry-pick coreos/etcd#9887 #27024

Merged
merged 1 commit into from
Jun 28, 2018

Conversation

bdarnell
Copy link
Contributor

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.

@bdarnell bdarnell requested review from tbg and a team June 27, 2018 17:27
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@bdarnell bdarnell changed the base branch from master to release-2.0 June 27, 2018 17:28
Release note (bug fix): Alleviate a scenario in which a large number of
uncommitted Raft commands could cause memory pressure at startup time.
@bdarnell bdarnell force-pushed the cherrypick-2.0-etcd branch from fea885f to b31dd58 Compare June 27, 2018 17:57
@bdarnell
Copy link
Contributor Author

OK, I think I've gotten the three-repo cherry pick sorted out correctly. I had to re-run CI a couple of times due to yarn/npm flakes.

@bdarnell
Copy link
Contributor Author

bors r=tschottdorf

@craig
Copy link
Contributor

craig bot commented Jun 27, 2018

Build failed

@bdarnell
Copy link
Contributor Author

bors r=tschottdorf

Yarn again.

@craig
Copy link
Contributor

craig bot commented Jun 28, 2018

Build failed

@bdarnell
Copy link
Contributor Author

bors r=tschottdorf

yarn again

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>
@craig
Copy link
Contributor

craig bot commented Jun 28, 2018

Build succeeded

@craig craig bot merged commit b31dd58 into cockroachdb:release-2.0 Jun 28, 2018
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