roachtest: fix allow_unsafe_internals edge cases #156795
Merged
Conversation
This file contains hidden or 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
Member
|
This change is |
DarrylWong
requested review from
herkolategan and
srosenberg
and removed request for
a team
herkolategan
reviewed
Nov 5, 2025
pkg/cmd/roachtest/tests/network.go
Outdated
|
|
||
| // Construct a connection URL to server i. | ||
| url := serverUrls[server-1] | ||
| url := fmt.Sprintf("{pgurl:%d}", server-1) |
Collaborator
There was a problem hiding this comment.
Should this not be just fmt.Sprintf("{pgurl:%d}", server), and not server-1, since I think expanders start from 1?
Contributor
Author
There was a problem hiding this comment.
Ah good catch, I was confused why the test didn't fail in this case, but it looks like it was "saved" by:
if i == expectedLeaseholder {
continue
}
where expectedLeaseholder = 1
This test uses a pgurl as part of a shell command, so it needs to be escaped to avoid any stray ampersands.
We sometimes need to construct pgurls for psql or postgres dbs which don't support this CRDB only parameter.
DarrylWong
force-pushed
the
fix_unsafe_internals
branch
from
4fdcd7a to
8913ec0
Compare
srosenberg
reviewed
Nov 6, 2025
| } | ||
|
|
||
| // Silence unused warning. | ||
| var _ = (&clusterImpl{}).InternalPGUrl |
srosenberg
reviewed
Nov 6, 2025
|
|
||
| // Construct a connection URL to server i. | ||
| url := serverUrls[server-1] | ||
| url := fmt.Sprintf("{pgurl:%d}", server) |
srosenberg
approved these changes
Nov 6, 2025
herkolategan
approved these changes
Nov 6, 2025
Contributor
Author
|
TFTRs bors r=herkolategan, srosenberg |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
In #156581, we started setting
allow_unsafe_internalsunconditionally for roachtests. However, there are a few edge cases where we can't set this. Namely when usingpsqlto connect to a postgres database where the CRDB only parameter does not exist.Fixes: #156702
Fixes: #156703
Fixes: #156706
Release note: none