Fix lost leader

prophet_leader.go

@@ -73,14 +73,7 @@ func (p *defaultProphet) disableLeader() {
 	atomic.StoreInt64(&p.leaderFlag, 0)
 	log.Infof("********become to follower now********")
 
-	value, err := p.elector.CurrentLeader(math.MaxUint64)
-	if err != nil {
-		log.Errorf("get current leader failed with %+v", err)
-	}
-	p.leader = nil
-	if len(value) > 0 {
-		p.leader = mustUnmarshal([]byte(value))
-	}
+	p.maybeLoadLeader()
 
 	// now, we are not leader
 	if p.coordinator != nil {
@@ -96,6 +89,21 @@ func (p *defaultProphet) disableLeader() {
 	p.cfg.Handler.ProphetBecomeFollower()
 }
 
+func (p *defaultProphet) maybeLoadLeader() {
+	value, err := p.elector.CurrentLeader(math.MaxUint64)
+	if err != nil {
+		log.Errorf("get current leader failed with %+v", err)
+	}
+
+	if len(value) == 0 {
+		return
+	}
+
+	if len(value) > 0 {
+		p.leader = mustUnmarshal([]byte(value))
+	}
+}
+
 func (p *defaultProphet) isLeader() bool {
 	return 1 == atomic.LoadInt64(&p.leaderFlag)
 }

prophet_transport.go

@@ -375,19 +375,20 @@ func (p *defaultProphet) doConnection(conn goetty.IOSession) error {
 
 func (p *defaultProphet) getLeaderClient() goetty.IOSession {
 	for {
-		l := p.leader
-		addr := p.node.Addr
-		if l != nil {
-			addr = l.Addr
+		if p.leader == nil {
+			p.maybeLoadLeader()
 		}
 
-		conn, err := p.createLeaderClient(addr)
-		if err == nil {
-			log.Infof("create leader connection to %s", addr)
-			return conn
+		if p.leader != nil {
+			conn, err := p.createLeaderClient(p.leader.Addr)
+			if err == nil {
+				log.Infof("create leader connection to %+v", p.leader)
+				return conn
+			}
+
+			log.Errorf("create leader connection failed, errors: %+v", err)
 		}
 
-		log.Errorf("create leader connection failed, errors: %+v", err)
 		time.Sleep(time.Second)
 	}
 }