Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

settings: patch backwards incompatible short type identifier change #56546

Merged
merged 1 commit into from
Nov 11, 2020

Conversation

irfansharif
Copy link
Contributor

We introduced a regression in #55994. In mixed-version clusters, when
the 21.1 node attempts to refresh settings, it expects to find a type
"v" for the version setting, but finds "m" already present in 20.2. We
revert the bits of #55994 that introduced this regression.

Release note (sql, cli change): In an earlier commit (3edd70b, not part
of any release, yet) we introduced a regression by representing the
shortened form of the cluster version setting's type as "v", from an
earlier "m". It's now back to what it was. Specifically:
- The setting_type column for version in SHOW CLUSTER SETTINGS
will now show an "m" instead of a "v"
- The valueType column for version in system.settings will now
show an "m" instead of a "v"


First commit is from #56480.

@irfansharif irfansharif requested review from knz and tbg November 11, 2020 05:42
@irfansharif irfansharif requested a review from a team as a code owner November 11, 2020 05:42
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

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

Only looked at second commit.

We introduced a regression in cockroachdb#55994. In mixed-version clusters, when
the 21.1 node attempts to refresh settings, it expects to find a type
"v" for the version setting, but finds "m" already present in 20.2. We
revert the bits of cockroachdb#55994 that introduced this regression.

Release note (sql, cli change): In an earlier commit (3edd70b, not part
of any release, yet) we introduced a regression by representing the
shortened form of the cluster version setting's type as "v", from an
earlier "m". It's now back to what it was. Specifically:
    - The `setting_type` column for `version` in `SHOW CLUSTER SETTINGS`
      will now show an "m" instead of a "v"
    - The `valueType` column for `version` in `system.settings` will now
      show an "m" instead of a "v"
@irfansharif
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Nov 11, 2020

Build succeeded:

@craig craig bot merged commit 516b807 into cockroachdb:master Nov 11, 2020
@irfansharif irfansharif deleted the 201111.version-short-revert branch November 11, 2020 16: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.

3 participants