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

cli/zip: Use "cluster" to identify the logical cluster instead of "tenant" #106298

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

knz
Copy link
Contributor

@knz knz commented Jul 6, 2023

Informs #106068.
Epic: CRDB-29380

Requested by Abbey Russell in replacement of #106117.

Release note (cluster virtualization): This patch renames the
subdirectory inside the output of cockroach debug zip when pointed
to a cluster with virtualization enabled to be cluster, which brings
the UX in coherence with the parameter of the same name in cockroach sql and the HTTP API parameter in the same name.

@knz knz requested review from yuzefovich and a team July 6, 2023 15:09
@knz knz requested a review from a team as a code owner July 6, 2023 15:09
@knz knz requested review from Santamaura and removed request for a team July 6, 2023 15:09
@knz knz added the A-multitenancy Related to multi-tenancy label Jul 6, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Jul 6, 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 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @knz and @Santamaura)


-- commits line 5 at r1:
nit: maybe s/generated zip/debug zip/ for clarity?

…nant"

Release note (cluster virtualization): This patch renames the
subdirectory inside the output of `cockroach debug zip` when pointed
to a cluster with virtualization enabled to be `cluster`, which brings
the UX in coherence with the parameter of the same name in `cockroach
sql` and the HTTP API parameter in the same name.
@knz
Copy link
Contributor Author

knz commented Jul 7, 2023

nit: maybe s/generated zip/debug zip/ for clarity?

Done

@knz
Copy link
Contributor Author

knz commented Jul 7, 2023

bors r=yuzefovich

@craig
Copy link
Contributor

craig bot commented Jul 7, 2023

Build succeeded:

@craig craig bot merged commit 9dda82c into cockroachdb:master Jul 7, 2023
2 checks passed
@blathers-crl
Copy link

blathers-crl bot commented Jul 7, 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 61cee9a to blathers/backport-release-23.1-106298: 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