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

sql: remove two private settings #49661

Merged
merged 1 commit into from Jun 1, 2020

Conversation

yuzefovich
Copy link
Member

@yuzefovich yuzefovich commented May 28, 2020

This commit removes two private settings that could disable planning of
multiple join readers (i.e would disable distribution) and disable
planning merge joiners (i.e. would simply prohibit the use of merge
joiners). It also retires two settings that have been removed after 20.1
was cut.

Release note: None

@yuzefovich yuzefovich requested a review from asubiotto May 28, 2020 19:11
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@jordanlewis
Copy link
Member

Is it valid to delete cluster settings? I know there's weird stuff if you load a binary on a database that has cluster settings that don't exist anymore. I run into it if I make a binary with a new cluster setting, run the binary, then go to current master without the cluster setting and rerun on the same data directory - there will be a log message "unknown cluster setting blah".

@yuzefovich
Copy link
Member Author

I've just tried creating a store on master and disabling these two settings, then restarting cockroach with this PR, looked at all cluster settings (and the settings were removed), then restarted with the master sha and the settings were correctly set to false. So it looks like we no longer fail if settings are deleted. I also remember this behavior causing problems, but it appears as if we fixed it.

Couple of other settings that we could - but I'm less inclined to - remove are sql.defaults.zigzag_join.enabled and sql.distsql.interleaved_joins.enabled. Thoughts about these?

@petermattis
Copy link
Collaborator

@dt Informed me on another PR about the retired settings list.

@yuzefovich
Copy link
Member Author

Oh, thanks Peter.

Copy link
Contributor

@asubiotto asubiotto 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 2 of 2 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

This commit removes two private settings that could disable planning of
multiple join readers (i.e would disable distribution) and disable
planning merge joiners (i.e. would simply prohibit the use of merge
joiners). It also retires two settings that have been removed after 20.1
was cut.

Release note: None
@yuzefovich
Copy link
Member Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jun 1, 2020

Build succeeded

@craig craig bot merged commit 6b7b413 into cockroachdb:master Jun 1, 2020
@yuzefovich yuzefovich deleted the remove-two-settings branch June 1, 2020 19:12
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.

None yet

5 participants