Skip to content

ccl/sqlproxyccl: fix TestWatchPods under stressrace#73946

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jaylim-crl:jay/fix-69220
Dec 17, 2021
Merged

ccl/sqlproxyccl: fix TestWatchPods under stressrace#73946
craig[bot] merged 1 commit intocockroachdb:masterfrom
jaylim-crl:jay/fix-69220

Conversation

@jaylim-crl
Copy link
Copy Markdown
Contributor

@jaylim-crl jaylim-crl commented Dec 16, 2021

Fixes #69220.
Regression from #67452.

In #67452, we omitted DRAINING pods from the tenant directory. Whenever a pod
goes into the DRAINING state, the pod watcher needs time to update the
directory. Not waiting for that while calling EnsureTenantAddr produces a
stale result. This commit updates TestWatchPods by polling on EnsureTenantAddr
until the pod watcher updates the directory.

Release note: None

Fixes cockroachdb#69220.
Regression from cockroachdb#67452.

In cockroachdb#67452, we omitted DRAINING pods from the tenant directory. Whenever a pod
goes into the DRAINING state, the pod watcher needs time to update the
directory. Not waiting for that while calling EnsureTenantAddr produces a
stale result. This commit updates TestWatchPods by polling on EnsureTenantAddr
until that has been completed.

Release note: None
@jaylim-crl jaylim-crl requested a review from a team as a code owner December 16, 2021 22:03
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor Author

@jaylim-crl jaylim-crl left a comment

Choose a reason for hiding this comment

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

See #69220 (comment) for more info.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @andy-kimball)

Copy link
Copy Markdown
Contributor

@andy-kimball andy-kimball left a comment

Choose a reason for hiding this comment

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

:lgtm:, thanks for fixing!

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

Copy link
Copy Markdown
Contributor Author

@jaylim-crl jaylim-crl left a comment

Choose a reason for hiding this comment

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

TFTRs!

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

Copy link
Copy Markdown
Contributor Author

@jaylim-crl jaylim-crl left a comment

Choose a reason for hiding this comment

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

bors r+

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 17, 2021

Build succeeded:

@craig craig bot merged commit 089affc into cockroachdb:master Dec 17, 2021
@jaylim-crl jaylim-crl deleted the jay/fix-69220 branch December 17, 2021 03:21
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.

ccl/sqlproxyccl/tenant: TestWatchPods failed

3 participants