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

backupccl: deflake multinode datadriven tests that set cluster settings #92911

Merged
merged 2 commits into from
Dec 5, 2022

Conversation

msbutler
Copy link
Collaborator

@msbutler msbutler commented Dec 2, 2022

The SET CLUSTER SETTING stmt propogrates the cluster setting to remote nodes asynchronously, but our data driven multinode tests incorrectly assumed that settings were propogated during stmt execution. This patch adds a new 'set-cluster-setting' dd cmd which will propogate the cluster setting to all nodes before the cmd returns.

Fixes #92808

Release note: none

@msbutler msbutler self-assigned this Dec 2, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@@ -87,6 +87,10 @@ type sqlDBKey struct {
}

type datadrivenTestState struct {
// clusters maps a name to its cluster
clusters map[string]serverutils.TestClusterInterface
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I wonder if we ought to change the new-server cmd to new-cluster, as it's really spinning up a new cluster and pushing all sql cmds to get served by the first server in the test cluster.

Copy link
Contributor

Choose a reason for hiding this comment

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

sgtm 👍

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

just pushed an extra commit for this.

@msbutler msbutler marked this pull request as ready for review December 2, 2022 14:32
@msbutler msbutler requested a review from a team as a code owner December 2, 2022 14:33
The `SET CLUSTER SETTING` stmt propogrates the cluster setting to remote nodes
asynchronously, but our data driven multinode tests incorrectly assumed that
settings were propogated during stmt execution. This patch adds a new
'set-cluster-setting' dd cmd which will propogate the cluster setting to all
nodes before the cmd returns.

Fixes cockroachdb#92808

Release note: none
Previously, whenever the dd driver worked with a test cluster, it was always
called a server instead of a cluster. This is confusing, given all the other
ways crdb uses the word "server". To clear the air, this patch replaces all
uses of the word "server" with "cluster", where appropriate.

Epic: none

Release note: None
@msbutler msbutler force-pushed the butler-cluster-settings branch from ebf217c to 5102486 Compare December 5, 2022 12:32
@msbutler msbutler changed the title backupccl: delake multinode datadriven tests that set cluster settings backupccl: deflake multinode datadriven tests that set cluster settings Dec 5, 2022
@msbutler
Copy link
Collaborator Author

msbutler commented Dec 5, 2022

TFTR!

bors r=adityamaru

@craig
Copy link
Contributor

craig bot commented Dec 5, 2022

Build succeeded:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ccl/backupccl: TestDataDriven failed
3 participants