From e964f5e1060c2d594e139e91aef278e562c0e6f3 Mon Sep 17 00:00:00 2001
From: Yun <zm@qq.com>
Date: Wed, 27 May 2026 14:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96leader=E6=8A=A2=E9=94=81?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 leader/leader.go | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/leader/leader.go b/leader/leader.go
index f9edbf2..904058d 100644
--- a/leader/leader.go
+++ b/leader/leader.go
@@ -23,10 +23,11 @@ type Leader struct {
 	ctx    context.Context
 	cancel context.CancelFunc
 
-	isLeader         bool         // 是否是领导
-	leaderLock       sync.RWMutex // 领导锁
-	leaderUniLockKey string       // 领导唯一锁
-	leaderKey        string       // 上报当前的Leader
+	isLeader         bool            // 是否是领导
+	leaderLock       sync.RWMutex    // 领导锁
+	leaderUniLockKey string          // 领导唯一锁
+	leaderKey        string          // 上报当前的Leader
+	leaderResetChan  chan (struct{}) // 快速抢占Leader位置
 
 	redis  redis.UniversalClient // redis
 	logger logger.Logger
@@ -58,6 +59,7 @@ func InitLeader(ctx context.Context, ref redis.UniversalClient, keyPrefix string
 		priority:         op.priority,
 		instanceId:       op.instanceId,
 		logger:           op.logger,
+		leaderResetChan:  make(chan struct{}, 1), // 非阻塞
 	}
 
 	l.wg.Add(1)
@@ -88,6 +90,8 @@ func (l *Leader) leaderElection() {
 		select {
 		case <-ticker.C:
 			l.getLeaderLock()
+		case <-l.leaderResetChan:
+			l.getLeaderLock()
 		case <-l.ctx.Done():
 			return
 		}
@@ -137,7 +141,7 @@ func (l *Leader) getLeaderLock() error {
 		if l.priority == nil {
 			return
 		}
-
+		// 感知我不是Leader的情况
 		for {
 			select {
 			case <-ctx.Done():
@@ -160,6 +164,14 @@ func (l *Leader) getLeaderLock() error {
 	l.isLeader = false
 	l.leaderLock.Unlock()
 
+	// 立刻尝试抢锁
+	go func() {
+		select {
+		case l.leaderResetChan <- struct{}{}:
+		default:
+		}
+	}()
+
 	return nil
 
 }