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

kvserver: deflake TestBackpressureNotAppliedWhenReducingRangeSize #75598

Merged
merged 1 commit into from
Jan 27, 2022
Merged

kvserver: deflake TestBackpressureNotAppliedWhenReducingRangeSize #75598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion pkg/kv/kvserver/client_replica_backpressure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func TestBackpressureNotAppliedWhenReducingRangeSize(t *testing.T) {
tc.SplitRangeOrFatal(t, tablePrefix)
require.NoError(t, tc.WaitForSplitAndInitialization(tablePrefix))

for i := 0; i < dataSize/rowSize; i++ {
for i := 0; i < numRows; i++ {
tdb.Exec(t, "UPSERT INTO foo VALUES ($1, $2)",
rRand.Intn(numRows), randutil.RandBytes(rRand, rowSize))
}
Expand Down Expand Up @@ -268,6 +268,9 @@ func TestBackpressureNotAppliedWhenReducingRangeSize(t *testing.T) {
// Then we'll add a new server and move the table there.
moveTableToNewStore(t, tc, args, tablePrefix)

// Ensure that the new replica has applied the same config.
waitForSpanConfig(t, tc, tablePrefix, newMax)

s, repl := getFirstStoreReplica(t, tc.Server(1), tablePrefix)
s.SetReplicateQueueActive(false)
require.Len(t, repl.Desc().Replicas().Descriptors(), 1)
Expand Down
2 changes: 1 addition & 1 deletion pkg/spanconfig/spanconfigkvsubscriber/kvsubscriber.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ func (s *KVSubscriber) run(ctx context.Context) error {
fn()
}

log.Info(ctx, "established range feed over span configurations table")
log.Infof(ctx, "established range feed over system.span_configurations starting at time %s", initialScanTS)

injectedErrCh := s.knobs.KVSubscriberErrorInjectionCh

Expand Down
4 changes: 2 additions & 2 deletions pkg/spanconfig/spanconfigsqlwatcher/sqlwatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (s *SQLWatcher) watchForDescriptorUpdates(
return nil, err
}

log.Infof(ctx, "established range feed over system.descriptors table starting at time %s", startTS)
log.Infof(ctx, "established range feed over system.descriptors starting at time %s", startTS)
return rf, nil
}

Expand Down Expand Up @@ -317,6 +317,6 @@ func (s *SQLWatcher) watchForZoneConfigUpdates(
return nil, err
}

log.Infof(ctx, "established range feed over system.zones table starting at time %s", startTS)
log.Infof(ctx, "established range feed over system.zones starting at time %s", startTS)
return rf, nil
}