From bc028fcf08d05bd8c48694b71891a0dd4852b57c Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Wed, 18 Dec 2024 13:51:15 +0800 Subject: [PATCH] syncer: exit watch leader immediately (#8824) (#8828) close tikv/pd#8823 Signed-off-by: ti-chi-bot Signed-off-by: Ryan Leung Co-authored-by: Ryan Leung --- server/region_syncer/client.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/server/region_syncer/client.go b/server/region_syncer/client.go index 55331ea0635..35fd80ec3b5 100644 --- a/server/region_syncer/client.go +++ b/server/region_syncer/client.go @@ -38,6 +38,7 @@ import ( const ( keepaliveTime = 10 * time.Second keepaliveTimeout = 3 * time.Second + retryInterval = time.Second ) // StopSyncWithLeader stop to sync the region with leader. @@ -163,7 +164,12 @@ func (s *RegionSyncer) StartSyncWithLeader(addr string) { } } log.Error("server failed to establish sync stream with leader", zap.String("server", s.server.Name()), zap.String("leader", s.server.GetLeader().GetName()), errs.ZapError(err)) - time.Sleep(time.Second) + select { + case <-ctx.Done(): + log.Info("stop synchronizing with leader due to context canceled") + return + case <-time.After(retryInterval): + } continue } @@ -175,7 +181,12 @@ func (s *RegionSyncer) StartSyncWithLeader(addr string) { if err = stream.CloseSend(); err != nil { log.Error("failed to terminate client stream", errs.ZapError(errs.ErrGRPCCloseSend, err)) } - time.Sleep(time.Second) + select { + case <-ctx.Done(): + log.Info("stop synchronizing with leader due to context canceled") + return + case <-time.After(retryInterval): + } break } if s.history.GetNextIndex() != resp.GetStartIndex() {