Skip to content

Commit 133dc2e

Browse files
craig[bot]iskettaneh
andcommitted
Merge #158593
158593: roachtest: deflake network/authentication/nodes=4 r=iskettaneh a=iskettaneh Recently (#158085) we stopped allowing acess to crdb_internal by default. Roachtests usually set a session variable to override that: https://github.com/cockroachdb/cockroach/blob/0eb1ca14aafbe71de1cfd0a7f200b8df50702e94/pkg/cmd/roachtest/cluster.go#L2986 However, this specific test runs a one-off command using CLI: "./cockroach sql -e". This commit sets that session var for this command. Fixes: #158550 Release note: None Co-authored-by: iskettaneh <173953022+iskettaneh@users.noreply.github.com>
2 parents 4c9b844 + 87955f6 commit 133dc2e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

pkg/cmd/roachtest/tests/network.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,12 @@ func runNetworkAuthentication(ctx context.Context, t test.Test, c cluster.Cluste
135135
if timeutil.Since(tStart) > 30*time.Second {
136136
t.L().Printf("still waiting for leases to move")
137137
// The leases have not moved yet, so display some progress.
138-
dumpRangesCmd := roachtestutil.NewCommand("./cockroach sql -e 'TABLE crdb_internal.ranges'").
138+
dumpRangesCmd := roachtestutil.NewCommand(
139+
"./cockroach sql -e 'SET allow_unsafe_internals=true; TABLE crdb_internal.ranges'").
139140
Flag("certs-dir", certsDir).
140141
Flag("port", "{pgport:1}").
141142
String()
143+
142144
t.L().Printf("SQL: %s", dumpRangesCmd)
143145
err = c.RunE(ctx, option.WithNodes(c.Node(1)), dumpRangesCmd)
144146
require.NoError(t, err)

0 commit comments

Comments
 (0)