Skip to content

sql: read db descriptor from store when constructing mr zone configs#61556

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
arulajmani:mr-flake-61320
Mar 5, 2021
Merged

sql: read db descriptor from store when constructing mr zone configs#61556
craig[bot] merged 1 commit intocockroachdb:masterfrom
arulajmani:mr-flake-61320

Conversation

@arulajmani
Copy link
Copy Markdown
Collaborator

Previously, when constructing multi-region zone configs for a database
in the type schema changer, we were doing so using a leased version of
the database descriptor. This meant it could be the case that we were
constructing a stale zone configuration, which manifested itself in
some CI failures. This patch fixes that issue by always reading the
database descriptor from the store when constructing zone
configurations in the type schema changer.

Previously, this was failing consistently under stress in ~30s. I have
this thing running perfectly for the last 10 minutes.

Fixes: #61320

Release justification: bug fix to new functionality
Release note: None

Previously, when constructing multi-region zone configs for a database
in the type schema changer, we were doing so using a leased version of
the database descriptor. This meant it could be the case that we were
constructing a stale zone configuration, which manifested itself in
some CI failures. This patch fixes that issue by always reading the
database descriptor from the store when constructing zone
configurations in the type schema changer.

Previously, this was failing consistently under stress in ~30s. I have
this thing running perfectly for the last 10 minutes.

Fixes: cockroachdb#61320

Release justification: bug fix to new functionality
Release note: None
@arulajmani arulajmani requested review from adityamaru and ajstorm March 5, 2021 17:21
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Collaborator

@ajstorm ajstorm left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@arulajmani
Copy link
Copy Markdown
Collaborator Author

TFTRs!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 5, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 5, 2021

Build succeeded:

@craig craig bot merged commit 90d6ba4 into cockroachdb:master Mar 5, 2021
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/logictestccl: TestCCLLogic failed

4 participants