etcdutil, leadership: avoid redundant created watch channel (tikv#7352)

close tikv#7351 Signed-off-by: lhy1024 <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
lhy1024 · Nov 10, 2023 · da30175 · da30175
1 parent afe6afc
commit da30175
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/election/leadership.go b/pkg/election/leadership.go
@@ -260,6 +260,7 @@ func (ls *Leadership) Watch(serverCtx context.Context, revision int64) {
 				continue
 			}
 		}
+		lastReceivedResponseTime = time.Now()
 		log.Info("watch channel is created", zap.Int64("revision", revision), zap.String("leader-key", ls.leaderKey), zap.String("purpose", ls.purpose))
 
 	watchChanLoop:

diff --git a/pkg/utils/etcdutil/etcdutil.go b/pkg/utils/etcdutil/etcdutil.go
@@ -707,7 +707,6 @@ func (lw *LoopWatcher) watch(ctx context.Context, revision int64) (nextRevision
 	}()
 	ticker := time.NewTicker(RequestProgressInterval)
 	defer ticker.Stop()
-	lastReceivedResponseTime := time.Now()
 
 	for {
 		if watcherCancel != nil {
@@ -736,8 +735,10 @@ func (lw *LoopWatcher) watch(ctx context.Context, revision int64) (nextRevision
 				continue
 			}
 		}
+		lastReceivedResponseTime := time.Now()
 		log.Info("watch channel is created in watch loop",
 			zap.Int64("revision", revision), zap.String("name", lw.name), zap.String("key", lw.key))
+
 	watchChanLoop:
 		select {
 		case <-ctx.Done():