From a0144ffa61694ae991235d4344df770204f45721 Mon Sep 17 00:00:00 2001
From: Jiachun Feng <jiachun_feng@proton.me>
Date: Tue, 15 Nov 2022 14:52:47 +0800
Subject: [PATCH] fix: leader checker (#510)

* fix: leader checker bug

* chore: rm  of test_dist_table_scan
---
 src/frontend/src/table.rs                |  2 --
 src/meta-srv/src/handler/check_leader.rs | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/frontend/src/table.rs b/src/frontend/src/table.rs
index f137b1ac6d..2f32847a5d 100644
--- a/src/frontend/src/table.rs
+++ b/src/frontend/src/table.rs
@@ -655,8 +655,6 @@ mod test {
     }
 
     #[tokio::test(flavor = "multi_thread")]
-    // FIXME(LFC): Remove ignore.
-    #[ignore]
     async fn test_dist_table_scan() {
         common_telemetry::init_default_ut_logging();
         let table = Arc::new(new_dist_table().await);
diff --git a/src/meta-srv/src/handler/check_leader.rs b/src/meta-srv/src/handler/check_leader.rs
index b9f7c4e750..67ca010962 100644
--- a/src/meta-srv/src/handler/check_leader.rs
+++ b/src/meta-srv/src/handler/check_leader.rs
@@ -20,13 +20,11 @@ impl HeartbeatHandler for CheckLeaderHandler {
             if election.is_leader() {
                 return Ok(());
             }
+            if let Some(header) = &mut acc.header {
+                header.error = Some(Error::is_not_leader());
+                ctx.set_skip_all();
+            }
         }
-
-        if let Some(header) = &mut acc.header {
-            header.error = Some(Error::is_not_leader());
-            ctx.set_skip_all();
-        }
-
         Ok(())
     }
 }