machine not registed should response leader address (#3950) (#4020)

Conflicts: src/meta/processors/BaseProcessor.h
vesoft-inc · Mar 14, 2022 · db575a8 · db575a8
1 parent d523376
commit db575a8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -741,11 +741,12 @@ void MetaClient::getResponse(Request req,
               }
 
               auto&& resp = t.value();
-              if (resp.get_code() == nebula::cpp2::ErrorCode::SUCCEEDED) {
+              auto code = resp.get_code();
+              if (code == nebula::cpp2::ErrorCode::SUCCEEDED) {
                 // succeeded
                 pro.setValue(respGen(std::move(resp)));
                 return;
-              } else if (resp.get_code() == nebula::cpp2::ErrorCode::E_LEADER_CHANGED) {
+              } else if (code == nebula::cpp2::ErrorCode::E_LEADER_CHANGED) {
                 updateLeader(resp.get_leader());
                 if (retry < retryLimit) {
                   evb->runAfterDelay(
@@ -768,7 +769,7 @@ void MetaClient::getResponse(Request req,
                       FLAGS_meta_client_retry_interval_secs * 1000);
                   return;
                 }
-              } else if (resp.get_code() == nebula::cpp2::ErrorCode::E_CLIENT_SERVER_INCOMPATIBLE) {
+              } else if (code == nebula::cpp2::ErrorCode::E_CLIENT_SERVER_INCOMPATIBLE) {
                 pro.setValue(respGen(std::move(resp)));
                 return;
               } else if (resp.get_code() == nebula::cpp2::ErrorCode::E_MACHINE_NOT_FOUND) {

diff --git a/src/meta/processors/BaseProcessor.h b/src/meta/processors/BaseProcessor.h
@@ -73,17 +73,24 @@ class BaseProcessor {
     delete this;
   }
 
-  void handleErrorCode(nebula::cpp2::ErrorCode code,
-                       GraphSpaceID spaceId = kDefaultSpaceId,
-                       PartitionID partId = kDefaultPartId) {
+  /**
+   * @brief Set error code and handle leader changed.
+   *
+   * @param code
+   */
+  void handleErrorCode(nebula::cpp2::ErrorCode code) {
     resp_.code_ref() = code;
     if (code == nebula::cpp2::ErrorCode::E_LEADER_CHANGED) {
-      handleLeaderChanged(spaceId, partId);
+      handleLeaderChanged();
     }
   }
 
-  void handleLeaderChanged(GraphSpaceID spaceId, PartitionID partId) {
-    auto leaderRet = kvstore_->partLeader(spaceId, partId);
+  /**
+   * @brief Set leader address to reponse.
+   *
+   */
+  void handleLeaderChanged() {
+    auto leaderRet = kvstore_->partLeader(kDefaultSpaceId, kDefaultPartId);
     if (ok(leaderRet)) {
       resp_.leader_ref() = toThriftHost(nebula::value(leaderRet));
     } else {

diff --git a/src/meta/processors/admin/HBProcessor.cpp b/src/meta/processors/admin/HBProcessor.cpp
@@ -37,6 +37,7 @@ void HBProcessor::process(const cpp2::HBReq& req) {
     if (!ActiveHostsMan::machineRegisted(kvstore_, host)) {
       LOG(ERROR) << "Machine " << host << " is not registed";
       handleErrorCode(nebula::cpp2::ErrorCode::E_MACHINE_NOT_FOUND);
+      setLeaderInfo();
       onFinished();
       return;
     }
@@ -122,5 +123,14 @@ void HBProcessor::process(const cpp2::HBReq& req) {
   onFinished();
 }
 
+void HBProcessor::setLeaderInfo() {
+  auto leaderRet = kvstore_->partLeader(kDefaultSpaceId, kDefaultPartId);
+  if (ok(leaderRet)) {
+    resp_.leader_ref() = toThriftHost(nebula::value(leaderRet));
+  } else {
+    resp_.code_ref() = nebula::error(leaderRet);
+  }
+}
+
 }  // namespace meta
 }  // namespace nebula
diff --git a/src/meta/processors/admin/HBProcessor.h b/src/meta/processors/admin/HBProcessor.h
@@ -53,6 +53,8 @@ class HBProcessor : public BaseProcessor<cpp2::HBResp> {
   HBProcessor(kvstore::KVStore* kvstore, const HBCounters* counters, ClusterID clusterId)
       : BaseProcessor<cpp2::HBResp>(kvstore), clusterId_(clusterId), counters_(counters) {}
 
+  void setLeaderInfo();
+
   ClusterID clusterId_{0};
   const HBCounters* counters_{nullptr};
   static std::atomic<int64_t> metaVersion_;