Skip to content
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

*: de-flake TestPaginatedBackupTenant and remove data race #74926

Merged
merged 3 commits into from
Jan 18, 2022
Merged

*: de-flake TestPaginatedBackupTenant and remove data race #74926

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
dfe73f6
backupccl: de-flake TestPaginatedBackupTenant
irfansharif Jan 18, 2022
6c30e38
server: de-flake TestStatusAPICombinedTransactions
irfansharif Jan 18, 2022
3218353
kvserver: squash data race
irfansharif Jan 18, 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
51 changes: 36 additions & 15 deletions pkg/ccl/backupccl/backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ func TestBackupRestoreAppend(t *testing.T) {

sqlDB.ExpectErr(t, "cannot append a backup of specific", "BACKUP system.users TO ($1, $2, "+
"$3)", test.backups...)
//TODO(dt): prevent backing up different targets to same collection?
// TODO(dt): prevent backing up different targets to same collection?

sqlDB.Exec(t, "DROP DATABASE data CASCADE")
sqlDB.Exec(t, "RESTORE DATABASE data FROM ($1, $2, $3)", test.backups...)
Expand Down Expand Up @@ -6793,7 +6793,14 @@ func TestPaginatedBackupTenant(t *testing.T) {
serverArgs := base.TestServerArgs{Knobs: base.TestingKnobs{JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals()}}
params := base.TestClusterArgs{ServerArgs: serverArgs}
var numExportRequests int
exportRequestSpans := make([]string, 0)

mu := struct {
syncutil.Mutex
exportRequestSpansSet map[string]struct{}
exportRequestSpans []string
}{}
mu.exportRequestSpansSet = make(map[string]struct{})
mu.exportRequestSpans = make([]string, 0)

requestSpanStr := func(span roachpb.Span, timestamp hlc.Timestamp) string {
spanStr := ""
Expand All @@ -6816,10 +6823,15 @@ func TestPaginatedBackupTenant(t *testing.T) {
for _, ru := range request.Requests {
if exportRequest, ok := ru.GetInner().(*roachpb.ExportRequest); ok &&
!isLeasingExportRequest(exportRequest) {
exportRequestSpans = append(
exportRequestSpans,
requestSpanStr(roachpb.Span{Key: exportRequest.Key, EndKey: exportRequest.EndKey}, exportRequest.ResumeKeyTS),
)

mu.Lock()
defer mu.Unlock()
req := requestSpanStr(roachpb.Span{Key: exportRequest.Key, EndKey: exportRequest.EndKey}, exportRequest.ResumeKeyTS)
if _, found := mu.exportRequestSpansSet[req]; found {
return nil // nothing to do
}
mu.exportRequestSpansSet[req] = struct{}{}
mu.exportRequestSpans = append(mu.exportRequestSpans, req)
numExportRequests++
}
}
Expand All @@ -6846,8 +6858,12 @@ func TestPaginatedBackupTenant(t *testing.T) {
_ = security.EmbeddedTenantIDs()

resetStateVars := func() {
mu.Lock()
defer mu.Unlock()

numExportRequests = 0
exportRequestSpans = exportRequestSpans[:0]
mu.exportRequestSpansSet = make(map[string]struct{})
mu.exportRequestSpans = mu.exportRequestSpans[:0]
}

_, conn10 := serverutils.StartTenant(t, srv,
Expand All @@ -6863,26 +6879,27 @@ func TestPaginatedBackupTenant(t *testing.T) {
systemDB.Exec(t, `SET CLUSTER SETTING kv.bulk_sst.max_allowed_overage='0b'`)

tenant10.Exec(t, `BACKUP DATABASE foo TO 'userfile://defaultdb.myfililes/test'`)
require.Equal(t, 1, numExportRequests)
startingSpan := roachpb.Span{Key: []byte("/Tenant/10/Table/56/1"), EndKey: []byte("/Tenant/10/Table/56/2")}
require.Equal(t, exportRequestSpans, []string{startingSpan.String()})
mu.Lock()
require.Equal(t, []string{startingSpan.String()}, mu.exportRequestSpans)
mu.Unlock()
resetStateVars()

// Two ExportRequests with one resume span.
systemDB.Exec(t, `SET CLUSTER SETTING kv.bulk_sst.target_size='50b'`)
tenant10.Exec(t, `BACKUP DATABASE foo TO 'userfile://defaultdb.myfililes/test2'`)
require.Equal(t, 2, numExportRequests)
startingSpan = roachpb.Span{Key: []byte("/Tenant/10/Table/56/1"),
EndKey: []byte("/Tenant/10/Table/56/2")}
resumeSpan := roachpb.Span{Key: []byte("/Tenant/10/Table/56/1/510/0"),
EndKey: []byte("/Tenant/10/Table/56/2")}
require.Equal(t, exportRequestSpans, []string{startingSpan.String(), resumeSpan.String()})
mu.Lock()
require.Equal(t, []string{startingSpan.String(), resumeSpan.String()}, mu.exportRequestSpans)
mu.Unlock()
resetStateVars()

// One ExportRequest for every KV.
systemDB.Exec(t, `SET CLUSTER SETTING kv.bulk_sst.target_size='10b'`)
tenant10.Exec(t, `BACKUP DATABASE foo TO 'userfile://defaultdb.myfililes/test3'`)
require.Equal(t, 5, numExportRequests)
var expected []string
for _, resume := range []exportResumePoint{
{[]byte("/Tenant/10/Table/56/1"), []byte("/Tenant/10/Table/56/2"), withoutTS},
Expand All @@ -6893,7 +6910,9 @@ func TestPaginatedBackupTenant(t *testing.T) {
} {
expected = append(expected, requestSpanStr(roachpb.Span{Key: resume.key, EndKey: resume.endKey}, resume.timestamp))
}
require.Equal(t, expected, exportRequestSpans)
mu.Lock()
require.Equal(t, expected, mu.exportRequestSpans)
mu.Unlock()
resetStateVars()

tenant10.Exec(t, `CREATE DATABASE baz; CREATE TABLE baz.bar(i int primary key, v string); INSERT INTO baz.bar VALUES (110, 'a'), (210, 'b'), (310, 'c'), (410, 'd'), (510, 'e')`)
Expand All @@ -6920,7 +6939,9 @@ func TestPaginatedBackupTenant(t *testing.T) {
} {
expected = append(expected, requestSpanStr(roachpb.Span{Key: resume.key, EndKey: resume.endKey}, resume.timestamp))
}
require.Equal(t, expected, exportRequestSpans)
mu.Lock()
require.Equal(t, expected, mu.exportRequestSpans)
mu.Unlock()
resetStateVars()

// TODO(adityamaru): Add a RESTORE inside tenant once it is supported.
Expand Down Expand Up @@ -8885,7 +8906,7 @@ DROP TABLE foo;
}

// TestRestoreNewDatabaseName tests the new_db_name optional feature for single database
//restores, which allows the user to rename the database they intend to restore.
// restores, which allows the user to rename the database they intend to restore.
func TestRestoreNewDatabaseName(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
Expand Down
3 changes: 3 additions & 0 deletions pkg/kv/kvserver/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2336,6 +2336,9 @@ func (s *Store) onSpanConfigUpdate(ctx context.Context, updated roachpb.Span) {
}

now := s.cfg.Clock.NowAsClockTimestamp()

s.mu.RLock()
irfansharif marked this conversation as resolved.
Show resolved Hide resolved
defer s.mu.RUnlock()
if err := s.mu.replicasByKey.VisitKeyRange(ctx, sp.Key, sp.EndKey, AscendingKeyOrder,
func(ctx context.Context, it replicaOrPlaceholder) error {
repl := it.repl
Expand Down
1 change: 1 addition & 0 deletions pkg/server/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,7 @@ func TestStatusAPICombinedTransactions(t *testing.T) {
defer log.Scope(t).Close(t)

params, _ := tests.CreateTestServerParams()
params.Knobs.SpanConfig = &spanconfig.TestingKnobs{ManagerDisableJobCreation: true} // TODO(irfansharif): #74919.
irfansharif marked this conversation as resolved.
Show resolved Hide resolved
testCluster := serverutils.StartNewTestCluster(t, 3, base.TestClusterArgs{
ServerArgs: params,
})
Expand Down