From 6d247f73fd09a3fb7b7cc06e0a293349c10fdf49 Mon Sep 17 00:00:00 2001
From: JeremyHi <jiachun_feng@proton.me>
Date: Mon, 24 Apr 2023 19:16:57 +0800
Subject: [PATCH] fix: add log on leader stepdown (#1450)

---
 src/meta-srv/src/election/etcd.rs | 16 ++++++++--------
 src/meta-srv/src/metasrv.rs       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/meta-srv/src/election/etcd.rs b/src/meta-srv/src/election/etcd.rs
index 8e49ccdc36..a14e90350b 100644
--- a/src/meta-srv/src/election/etcd.rs
+++ b/src/meta-srv/src/election/etcd.rs
@@ -134,9 +134,7 @@ impl Election for EtcdElection {
             .context(error::EtcdFailedSnafu)?;
 
         if let Some(leader) = res.leader() {
-            let (mut keeper, mut receiver) = self
-                .client
-                .lease_client()
+            let (mut keeper, mut receiver) = lease_client
                 .keep_alive(lease_id)
                 .await
                 .context(error::EtcdFailedSnafu)?;
@@ -165,11 +163,13 @@ impl Election for EtcdElection {
                             }
                         }
                     } else {
-                        if let Err(e) = self
-                            .leader_watcher
-                            .send(LeaderChangeMessage::StepDown(Arc::new(leader.clone())))
-                        {
-                            error!("Failed to send leader change message, error: {e}");
+                        if self.is_leader.load(Ordering::Relaxed) {
+                            if let Err(e) = self
+                                .leader_watcher
+                                .send(LeaderChangeMessage::StepDown(Arc::new(leader.clone())))
+                            {
+                                error!("Failed to send leader change message, error: {e}");
+                            }
                         }
                         break;
                     }
diff --git a/src/meta-srv/src/metasrv.rs b/src/meta-srv/src/metasrv.rs
index e129941d00..64217ad79c 100644
--- a/src/meta-srv/src/metasrv.rs
+++ b/src/meta-srv/src/metasrv.rs
@@ -141,9 +141,9 @@ impl MetaSrv {
                                         error!("Failed to recover procedures, error: {e}");
                                     }
                                 }
-                                LeaderChangeMessage::StepDown(_) => {
+                                LeaderChangeMessage::StepDown(leader) => {
                                     // TODO(LFC): TBC
-                                    unimplemented!()
+                                    error!("Leader :{:?} step down", leader);
                                 }
                             }
                         }