From d2fea8d9cf4a9a02079fb64e25e2bc7d19e9d72c Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Sun, 26 May 2024 09:59:02 -0400 Subject: [PATCH] Add a few more expected TestMain goroutines to ignore list Signed-off-by: Matt Lord --- go/test/utils/noleak.go | 4 ++++ go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go/test/utils/noleak.go b/go/test/utils/noleak.go index a0d1809087a..b14d71140f8 100644 --- a/go/test/utils/noleak.go +++ b/go/test/utils/noleak.go @@ -84,6 +84,10 @@ func ensureNoGoroutines() error { goleak.IgnoreTopFunction("vitess.io/vitess/go/pools/smartconnpool.(*ConnPool[...]).runWorker.func1"), goleak.IgnoreTopFunction("vitess.io/vitess/go/stats.(*Rates).track"), goleak.IgnoreTopFunction("vitess.io/vitess/go/timer.(*Timer).run"), + goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/srvtopo.NewResilientServer.NewSrvVSchemaWatcher.func1"), + goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/srvtopo.NewResilientServer.NewSrvVSchemaWatcher.func2"), + goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/topo/memorytopo.(*Conn).Watch.func1"), + goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/topo.(*Server).WatchSrvVSchema.func1"), goleak.IgnoreTopFunction("testing.tRunner.func1"), } diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go index f8a05e9e217..746d2b85630 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go @@ -34,11 +34,6 @@ func TestStallHandler(t *testing.T) { ctx, cancel := context.WithTimeout(lctx, tme) defer cancel() - ovpd := vplayerProgressDeadline - vplayerProgressDeadline = tme / 10 - defer func() { - vplayerProgressDeadline = ovpd - }() concurrency := 10000 dl := time.Duration(10 * time.Second)