Skip to content

settingswatcher: version guard support for clusters bootstrapped at old versions#98495

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jeffswenson:jeffswenson-version-guard-unitialized-setting
Mar 13, 2023
Merged

settingswatcher: version guard support for clusters bootstrapped at old versions#98495
craig[bot] merged 1 commit intocockroachdb:masterfrom
jeffswenson:jeffswenson-version-guard-unitialized-setting

Conversation

@jeffswenson
Copy link
Copy Markdown
Collaborator

When a cluster is bootstrapping, the sql server is initialized before the cluster version is populated in the DB. Previously, the version guard utility was unable to handle this state if the version is older than the maxVersion used to initialize the version guard. Now, the versionGuard handles this bootstrapping state by falling back on the in-memory cluster version.

Part of #94843

Release note: none

@jeffswenson jeffswenson requested a review from ajwerner March 13, 2023 14:45
@jeffswenson jeffswenson requested review from a team as code owners March 13, 2023 14:45
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@jeffswenson
Copy link
Copy Markdown
Collaborator Author

This change is cherry-picked into the following PRs:
#98445
#98446
#98463

@jeffswenson jeffswenson force-pushed the jeffswenson-version-guard-unitialized-setting branch from 2622e55 to c3077c1 Compare March 13, 2023 14:49
@knz knz requested a review from healthy-pod March 13, 2023 14:50
@jeffswenson jeffswenson changed the title settingswatcher: add version guard clusters bootstrapped at old versions settingswatcher: version guard support for clusters bootstrapped at old versions Mar 13, 2023
…ld versions

When a cluster is bootstrapping, the sql server is initialized before
the cluster version is populated in the DB. Previously, the version
guard utility was unable to handle this state if the version is older
than the maxVersion used to initialize the version guard. Now, the
versionGuard handles this bootstrapping state by falling back on the
in-memory cluster version.

Part of cockroachdb#94843

Release note: none
@jeffswenson jeffswenson force-pushed the jeffswenson-version-guard-unitialized-setting branch from c3077c1 to 506a3ef Compare March 13, 2023 15:15
Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

LGTM

@jeffswenson
Copy link
Copy Markdown
Collaborator Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Mar 13, 2023

Build succeeded:

@craig craig bot merged commit 2d63378 into cockroachdb:master Mar 13, 2023
@jeffswenson jeffswenson deleted the jeffswenson-version-guard-unitialized-setting branch March 13, 2023 21:14
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.

3 participants