Skip to content

roachtest: misc fixes #94361

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.

Sign up for GitHub

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

Merged
craig merged 3 commits into from
Dec 29, 2022
Merged

roachtest: misc fixes #94361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40793e0
roachtest: fix follower-reads
tbg Dec 28, 2022
db9991e
roachtest: add missing paren in network
tbg Dec 28, 2022
c413dc9
roachtest: fix error depth
tbg Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/test_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ func (t *testImpl) addFailure(format string, args ...interface{}) {
if format == "" {
format = strings.Repeat(" %v", len(args))[1:]
}
reportFailure := newFailure(errors.NewWithDepthf(1, format, args...), collectErrors(args))
reportFailure := newFailure(errors.NewWithDepthf(2, format, args...), collectErrors(args))

t.mu.Lock()
defer t.mu.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/follower_reads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ func initFollowerReadsDB(
const q2 = `
SELECT
count(distinct substring(unnest(replica_localities), 'region=([^,]*)'))
FROM [SHOW RANGES FROM TABLE test]`
FROM [SHOW RANGES FROM TABLE test.test]`

var distinctRegions int
require.NoError(t, db.QueryRowContext(ctx, q2).Scan(&distinctRegions))
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ SELECT $1::INT = ALL (
SELECT lease_holder
FROM [SHOW CLUSTER RANGES WITH TABLES, DETAILS]
WHERE (start_key = '/System/NodeLiveness' AND end_key = '/System/NodeLivenessMax')
OR (table_name IN ('users', 'role_members', 'role_options')
OR (table_name IN ('users', 'role_members', 'role_options'))
)`
t.L().Printf("SQL: %s", waitLeases)
require.NoError(t, db.QueryRow(waitLeases, expectedLeaseholder).Scan(&ok))
Expand Down