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

schemachanger: deflake TestConcurrentDeclarativeSchemaChanges #107636

Merged
merged 1 commit into from
Jul 26, 2023

Conversation

postamar
Copy link
Contributor

This commit deflakes this test by checking that the second schema change actually does block because of the first one, rather than checking that it has blocked. The bug was that the latter wasn't always guaranteed to happen because we didn't force the schema changes to run in parallel.

Fixes #106732.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

This commit deflakes this test by checking that the second schema change
actually does block because of the first one, rather than checking that
it has blocked. The bug was that the latter wasn't always guaranteed to
happen because we didn't force the schema changes to run in parallel.

Fixes cockroachdb#106732.

Release note: None
@postamar postamar added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-22.2.x labels Jul 26, 2023
@postamar postamar marked this pull request as ready for review July 26, 2023 16:58
@postamar postamar requested a review from a team as a code owner July 26, 2023 16:58
@postamar
Copy link
Contributor Author

Thanks for the review!

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 26, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jul 26, 2023

This PR was included in a batch that timed out, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented Jul 26, 2023

Build succeeded:

@craig craig bot merged commit 284b6c0 into cockroachdb:master Jul 26, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jul 26, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from abc0966 to blathers/backport-release-22.2-107636: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


error creating merge commit from abc0966 to blathers/backport-release-23.1-107636: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pkg/sql/schemachanger/schemachanger_test: TestConcurrentDeclarativeSchemaChanges failed
3 participants