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

backport-21.2: roachtest: fix cluster-init #70259

Merged
merged 4 commits into from
Sep 27, 2021

Conversation

knz
Copy link
Contributor

@knz knz commented Sep 15, 2021

Fixes #70186 .

Release justification: non-production code changes

Release note: NoneBackport 4/4 commits from #69940.

/cc @cockroachdb/release

knz and others added 4 commits September 15, 2021 16:29
Release justification: non-production code changes

Release note: None
See discussion here;
cockroachdb#67105 (comment)

Release justification: non-production code changes

Release note: None
Release justification: test-only change
Release note: None
Give it a progress bar and a rudimentary context cancellation policy.

Release justification: testing-only changes
Release note: None
@knz knz requested a review from tbg September 15, 2021 14:30
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member

tbg commented Sep 16, 2021

Looks good to me, but the final merge is not my call. I would conservatively hold off on the merge until beta.1 is cut, on the argument that there is a change to a helper used throughout the test suite affected here, and a bug in it could produce fallout the investigation of which could delay the beta. I doubt this will actually happen but it's "cheap" to wait a week here.

@jbowens
Copy link
Collaborator

jbowens commented Sep 16, 2021

@knz #70169 looks like it's a failure against the master branch. Does this actually address #70169 or a different issue?

@knz
Copy link
Contributor Author

knz commented Sep 17, 2021

my mistake. it's issue #70186 . fixing PR description.

Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Things have been stable, so assuming this has 21.2 approval from Isaac it can merge.

@knz
Copy link
Contributor Author

knz commented Sep 27, 2021

Approved today by @isaactwong

@knz knz merged commit fdb6436 into cockroachdb:release-21.2 Sep 27, 2021
@knz knz deleted the backport21.2-69940 branch September 27, 2021 21:00
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.

4 participants