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: session var disable_drop_virtual_cluster #106121

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

knz
Copy link
Contributor

@knz knz commented Jul 4, 2023

Informs #106068.
Epic: CRDB-29380

This replaces disable_drop_tenant, together with the cluster setting sql.drop_virtual_cluster.enabled (replaces
sql.drop_tenant.enabled).

We are OK with this breaking change since the feature was not yet exposed to end-users.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz marked this pull request as ready for review July 4, 2023 17:46
@knz knz requested review from a team as code owners July 4, 2023 17:46
@knz knz added A-multitenancy Related to multi-tenancy backport-23.1.x Flags PRs that need to be backported to 23.1 labels Jul 4, 2023
Copy link
Member

@yuzefovich yuzefovich 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 12 of 12 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @stevendanna)

@knz knz force-pushed the 20230704-disable-drop-tenant branch from 1038f2f to 6effeb8 Compare July 6, 2023 10:38
@knz
Copy link
Contributor Author

knz commented Jul 6, 2023

TFYR!

bors r=yuzefovich

@craig
Copy link
Contributor

craig bot commented Jul 6, 2023

Merge conflict.

This replaces `disable_drop_tenant`, together with the cluster setting
`sql.drop_virtual_cluster.enabled` (replaces
`sql.drop_tenant.enabled`).

We are OK with this breaking change since the feature was not yet
exposed to end-users.

Release note: None
@knz knz force-pushed the 20230704-disable-drop-tenant branch from 6effeb8 to ab28123 Compare July 6, 2023 21:19
@knz
Copy link
Contributor Author

knz commented Jul 6, 2023

bors r=yuzefovich

@craig
Copy link
Contributor

craig bot commented Jul 6, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jul 6, 2023

Build succeeded:

@craig craig bot merged commit 06fde61 into cockroachdb:master Jul 6, 2023
@blathers-crl
Copy link

blathers-crl bot commented Jul 6, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from ab28123 to blathers/backport-release-23.1-106121: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-multitenancy Related to multi-tenancy backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants