roachprod: don't overwrite tenant in pgurl expansion
#123765
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
Previously, the `{pgurl}` expansion would force the `cluster`
connection parameter to `system`. This means that if the caller
previously configured a different default virtual cluster, `pgurl`
would ignore that and continue connecting to `system`, which is
quite surprising.
In this commit, we only set an explicit `cluster` connection parameter
if the user passed one; this should allow `pgurl` users to connect to
the default tenant by default.
Epic: none
Release note: None
renatolabs
force-pushed
the
rc/roachprod-dont-overwrite-tenant
branch
from
fc1b4fd to
4ea8f39
Compare
renatolabs
requested review from
srosenberg and
DarrylWong
and removed request for
a team
|
Multi-tenant tests pass on this branch. |
srosenberg
approved these changes
May 8, 2024
|
TFTRs! bors r=DarrylWong,srosenberg |
renatolabs
added
backport-23.1.x
This was referenced May 8, 2024
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from 4ea8f39 to blathers/backport-release-23.1-123765: 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the
{pgurl}expansion would force theclusterconnection parameter tosystem. This means that if the caller previously configured a different default virtual cluster,pgurlwould ignore that and continue connecting tosystem, which is quite surprising.In this commit, we only set an explicit
clusterconnection parameter if the user passed one; this should allowpgurlusers to connect to the default tenant by default.Epic: none
Release note: None