From 251c7555ab15fa0e510bc79fd2289a3bb75b4205 Mon Sep 17 00:00:00 2001
From: liwenhui-soul <38217397+liwenhui-soul@users.noreply.github.com>
Date: Tue, 17 Jan 2023 11:42:15 +0800
Subject: [PATCH] Revert "do not check term for leader info by default para"

This reverts commit 593bffcbdff0e0c6b32335165c0bce2137af50dd.
---
 src/meta/ActiveHostsMan.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/meta/ActiveHostsMan.cpp b/src/meta/ActiveHostsMan.cpp
index 1dd1bb811a5..aa5aa707e9b 100644
--- a/src/meta/ActiveHostsMan.cpp
+++ b/src/meta/ActiveHostsMan.cpp
@@ -13,7 +13,6 @@
 DECLARE_int32(heartbeat_interval_secs);
 DEFINE_int32(agent_heartbeat_interval_secs, 60, "Agent heartbeat interval in seconds");
 DECLARE_uint32(expired_time_factor);
-DEFINE_bool(check_term_for_leader_info, false, "if check term when update leader info");
 
 namespace nebula {
 namespace meta {
@@ -46,16 +45,14 @@ nebula::cpp2::ErrorCode ActiveHostsMan::updateHostInfo(kvstore::KVStore* kv,
     TermID term = -1;
     nebula::cpp2::ErrorCode code;
     for (auto i = 0U; i != leaderKeys.size(); ++i) {
-      if (FLAGS_check_term_for_leader_info) {
-        if (statusVec[i].ok()) {
-          std::tie(std::ignore, term, code) = MetaKeyUtils::parseLeaderValV3(vals[i]);
-          if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
-            LOG(INFO) << apache::thrift::util::enumNameSafe(code);
-            continue;
-          }
-          if (terms[i] <= term) {
-            continue;
-          }
+      if (statusVec[i].ok()) {
+        std::tie(std::ignore, term, code) = MetaKeyUtils::parseLeaderValV3(vals[i]);
+        if (code != nebula::cpp2::ErrorCode::SUCCEEDED) {
+          LOG(INFO) << apache::thrift::util::enumNameSafe(code);
+          continue;
+        }
+        if (terms[i] <= term) {
+          continue;
         }
       }
       // write directly if not exist, or update if has greater term