Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
133056: backupccl: deflake TestShowBackupDebugIDs r=kev-cao a=msbutler

Previously cheked for specific desc ID's which is non-deterministic.

Fixes #131404

Release note: none

133059: backupccl: skip TestBackupSharedProcessTenantNodeDown under deadlock r=kev-cao a=msbutler

Informs #132636

Release note: none

Co-authored-by: Michael Butler <[email protected]>
  • Loading branch information
craig[bot] and msbutler committed Oct 21, 2024
3 parents 4a5e4d2 + 460fdd2 + bf824c5 commit 9cbb2d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
1 change: 1 addition & 0 deletions pkg/ccl/backupccl/backup_tenant_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func TestBackupSharedProcessTenantNodeDown(t *testing.T) {
ctx := context.Background()

skip.UnderRace(t, "multi-node, multi-tenant test too slow under race")
skip.UnderDeadlock(t, "too slow under deadlock detector")
params := base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
DefaultTestTenant: base.TestControlsTenantsExplicitly,
Expand Down
23 changes: 0 additions & 23 deletions pkg/ccl/backupccl/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -698,29 +698,6 @@ func TestShowBackupWithDebugIDs(t *testing.T) {

require.Greater(t, dbID, 0)
require.Greater(t, publicID, 0)

res := sqlDB.QueryStr(t, `
SELECT database_name, database_id, parent_schema_name, parent_schema_id, object_name, object_id, object_type
FROM [SHOW BACKUP FROM LATEST IN $1 WITH debug_ids]
ORDER BY object_id`, full)

dbIDStr := strconv.Itoa(dbID)
publicIDStr := strconv.Itoa(publicID)
schemaIDStr := strconv.Itoa(dbID + 5)

expectedObjects := [][]string{
{"NULL", "NULL", "NULL", "NULL", "data", dbIDStr, "database"},
{"data", dbIDStr, "NULL", "NULL", "public", strconv.Itoa(dbID + 1), "schema"},
{"data", dbIDStr, "public", publicIDStr, "bank", strconv.Itoa(dbID + 2), "table"},
{"data", dbIDStr, "public", publicIDStr, "welcome", strconv.Itoa(dbID + 3), "type"},
{"data", dbIDStr, "public", publicIDStr, "_welcome", strconv.Itoa(dbID + 4), "type"},
{"data", dbIDStr, "NULL", "NULL", "sc", schemaIDStr, "schema"},
{"data", dbIDStr, "sc", schemaIDStr, "t1", strconv.Itoa(dbID + 6), "table"},
{"data", dbIDStr, "sc", schemaIDStr, "t2", strconv.Itoa(dbID + 7), "table"},
}

require.Equal(t, expectedObjects, res)

}

func TestShowBackupPathIsCollectionRoot(t *testing.T) {
Expand Down

0 comments on commit 9cbb2d3

Please sign in to comment.