Skip to content

changefeedccl: fix rolling restart test#103903

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jayshrivastava:rolling-restart-test
May 26, 2023
Merged

changefeedccl: fix rolling restart test#103903
craig[bot] merged 1 commit intocockroachdb:masterfrom
jayshrivastava:rolling-restart-test

Conversation

@jayshrivastava
Copy link
Copy Markdown
Contributor

Previously, this test would deadlock due to it waiting for the wrong checkpoint. Now the test correctly waits for a checkpoint greater than beforeInsert before waiting for a highwater greater than beforeInsert.

This tests also wraps channel sends and receives with select statements so, if ever required, the test can explicitly fail with a timeout instead of deadlocking.

Release note: None
Epic: None
Closes: #103791

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@jayshrivastava jayshrivastava force-pushed the rolling-restart-test branch from 0b83fbd to b8cabd7 Compare May 25, 2023 17:23
@jayshrivastava jayshrivastava requested a review from miretskiy May 25, 2023 17:24
@jayshrivastava jayshrivastava marked this pull request as ready for review May 25, 2023 17:24
@jayshrivastava jayshrivastava requested a review from a team as a code owner May 25, 2023 17:24
Previously, this test would deadlock due to it waiting
for the wrong checkpoint. Now the test correctly waits
for a checkpoint greater than `beforeInsert` before
waiting for a highwater greater than `beforeInsert`.

This tests also wraps channel sends and receives with
`select` statements so, if ever required, the test can
explicitly fail with a timeout instead of deadlocking.

Release note: None
Epic: None
Closes: cockroachdb#103791
@jayshrivastava jayshrivastava force-pushed the rolling-restart-test branch from b8cabd7 to 10c1682 Compare May 25, 2023 21:04
@jayshrivastava
Copy link
Copy Markdown
Contributor Author

bors r=miretskiy

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 26, 2023

Build failed:

@jayshrivastava
Copy link
Copy Markdown
Contributor Author

bors retry

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 26, 2023

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 26, 2023

Build succeeded:

@craig craig bot merged commit 83904a8 into cockroachdb:master May 26, 2023
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.

changefeedccl: flake in TestChangefeedHandlesRollingRestart

3 participants