Skip to content

Commit ed9b0e5

Browse files
craig[bot]tbg
andcommitted
Merge #151192
151192: roachtest: improve obs in acceptance/gossip/restart r=arulajmani a=tbg In a test, we see occasional delays to propagate updated settings within 10s. This is right following a sequence of node restarts, so it makes sense that rangefeeds would be a little slow. This logging can potentially help. Closes #151022. Epic: none Co-authored-by: Tobias Grieger <[email protected]>
2 parents 034a4cb + 38f52e0 commit ed9b0e5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

pkg/cmd/roachtest/tests/gossip.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,9 @@ func runGossipPeerings(ctx context.Context, t test.Test, c cluster.Cluster) {
357357
}
358358

359359
func runGossipRestart(ctx context.Context, t test.Test, c cluster.Cluster) {
360-
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings())
360+
opts := option.DefaultStartOpts()
361+
opts.RoachprodOpts.ExtraArgs = []string{"--vmodule=*=1"}
362+
c.Start(ctx, t.L(), opts, install.MakeClusterSettings())
361363

362364
// Repeatedly stop and restart a cluster and verify that we can perform basic
363365
// operations. This is stressing the gossiping of the first range descriptor
@@ -377,7 +379,7 @@ func runGossipRestart(ctx context.Context, t test.Test, c cluster.Cluster) {
377379
t.L().Printf("%d: restarting all nodes\n", i)
378380
// Tell the httpClient our saved session cookies are no longer valid after a restart.
379381
g.httpClient.ResetSession()
380-
c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings())
382+
c.Start(ctx, t.L(), opts, install.MakeClusterSettings())
381383
}
382384
}
383385

pkg/kv/kvclient/rangefeed/rangefeedcache/watcher.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ func (s *Watcher[E]) Run(ctx context.Context) error {
312312
rangefeed.WithDiff(s.withPrevValue),
313313
rangefeed.WithRowTimestampInInitialScan(s.withRowTSInInitialScan),
314314
rangefeed.WithOnInitialScanError(func(ctx context.Context, err error) (shouldFail bool) {
315+
log.VInfof(ctx, 1, "initial scan error: %s", err)
315316
// TODO(irfansharif): Consider if there are other errors which we
316317
// want to treat as permanent. This was cargo culted from the
317318
// settings watcher.

pkg/server/settingswatcher/settings_watcher.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ func (s *SettingsWatcher) Start(ctx context.Context) error {
185185
defer s.mu.Unlock()
186186
s.mu.updater.ResetRemaining(ctx)
187187
if !initialScan.done {
188+
log.VInfof(ctx, 1, "initial settings scan complete")
188189
initialScan.done = true
189190
close(initialScan.ch)
190191
}

0 commit comments

Comments
 (0)