Skip to content

upgrade/upgrades: fix TestUpgradeSchemaChangerElements race condition#100598

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
fqazi:TestUpgradeSchemaChangerElementsDeflake
Apr 6, 2023
Merged

upgrade/upgrades: fix TestUpgradeSchemaChangerElements race condition#100598
craig[bot] merged 1 commit intocockroachdb:masterfrom
fqazi:TestUpgradeSchemaChangerElementsDeflake

Conversation

@fqazi
Copy link
Copy Markdown
Collaborator

@fqazi fqazi commented Apr 4, 2023

Previously, TestUpgradeSchemaChangerElements started a schema change
and intentionally caused it to be paused. It then resumed this job
and started a version upgrade. The version upgrade being tested is
meant to pause schema change jobs intentionally, which could lead
to the job getting paused again before it resumed. This patch, adds
one more channel to ensure synchronization in this sequence.

Additionally, we will further limit the scope of version to make
this test a bit shorter, so that we are only focused on the upgrade
for schema changes

Fixes: #98062.

Release note: None

@fqazi fqazi requested a review from a team April 4, 2023 14:41
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@fqazi fqazi force-pushed the TestUpgradeSchemaChangerElementsDeflake branch 2 times, most recently from 1a7d3ee to bdbcb43 Compare April 4, 2023 15:06
Previously, TestUpgradeSchemaChangerElements started a schema change
and intentionally caused it to be paused. It then resumed this job
and started a version upgrade. The version upgrade being tested is
meant to pause schema change jobs intentionally, which could lead
to the job getting paused again before it resumed. This patch, adds
one more channel to ensure synchronization in this sequence.

Additionally, we will further limit the scope of version to make
this test a bit shorter, so that we are only focused on the upgrade
for schema changes

Fixes: cockroachdb#98602

Release note: None
@fqazi fqazi force-pushed the TestUpgradeSchemaChangerElementsDeflake branch from bdbcb43 to b8ffd10 Compare April 4, 2023 15:23
@fqazi
Copy link
Copy Markdown
Collaborator Author

fqazi commented Apr 6, 2023

@chengxiong-ruan TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 6, 2023

Build failed (retrying...):

@craig craig bot merged commit b02b1b5 into cockroachdb:master Apr 6, 2023
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 6, 2023

Build succeeded:

@rytaft
Copy link
Copy Markdown
Collaborator

rytaft commented Apr 6, 2023

Did you actually intend for this to close #98602 or a different issue?

@fqazi
Copy link
Copy Markdown
Collaborator Author

fqazi commented Apr 7, 2023

@rytaft Sorry this was a stupid typo on my part it should have been #98062.

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.

upgrade/upgrades: TestUpgradeSchemaChangerElements failed

4 participants