Fix lm leader change (vesoft-inc#2791)

* Fix lm * Fix lm
yixinglu · May 23, 2023 · 22ff7f5 · 22ff7f5
1 parent e975ec0
commit 22ff7f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/common/encryption/LicenseManagerConnector.cpp b/src/common/encryption/LicenseManagerConnector.cpp
@@ -88,6 +88,7 @@ Status LicenseManagerConnector::init(const std::string& LmUrl,
   bgThread_->addTask(&LicenseManagerConnector::threadFunc, this);
 
   LOG(INFO) << "[License Manager] Initialization succeeded, LMId: " << LMId_;
+  readFromCache_ = false;
   return Status::OK();
 }
 
@@ -282,7 +283,7 @@ ErrorOr<nebula::cpp2::ErrorCode, std::string> LicenseManagerConnector::buildRawR
   for (auto& host : nebula::value(res)) {
     queryCPU += host.cpuNum_;
   }
-  VLOG(2) << "[License Manager] Total query node number: " << queryNode
+  VLOG(2) << "[License Manager] Total registered query node number: " << queryNode
           << ", query CPU cores: " << queryCPU;
 
   // Get active storage hosts
@@ -297,7 +298,7 @@ ErrorOr<nebula::cpp2::ErrorCode, std::string> LicenseManagerConnector::buildRawR
   for (auto& host : nebula::value(res)) {
     storageCPU += host.cpuNum_;
   }
-  VLOG(2) << "[License Manager] Total storage node number: " << storageNode
+  VLOG(2) << "[License Manager] Total registered storage node number: " << storageNode
           << ", storage CPU cores: " << storageCPU;
 
   folly::dynamic request = folly::dynamic::object();

diff --git a/src/common/encryption/LicenseManagerConnector.h b/src/common/encryption/LicenseManagerConnector.h
@@ -218,7 +218,9 @@ class LicenseManagerConnector final {
   // If the LMC is not ready, all heartbeat will be rejected
   bool dropAllHosts_ = false;
   bool isOverLimit_ = false;
-  bool readFromCache_ = false;
+
+  // Follower will read cache by default, this flag will be updated if connect to LM successfully
+  bool readFromCache_ = true;
 };
 
 }  // namespace nebula
diff --git a/src/meta/processors/admin/HBProcessor.cpp b/src/meta/processors/admin/HBProcessor.cpp
@@ -338,9 +338,9 @@ nebula::cpp2::ErrorCode HBProcessor::checkResourceUsage(const cpp2::HostRole rol
                                            : LMCIns->resourceQuota_.storageQuota_;
 
   auto resourceType = LMCIns->resourceQuota_.type_;
-  DLOG(INFO) << "[License Manager] Resource type: " << resourceType
-             << ", query resource cap: " << LMCIns->resourceQuota_.graphQuota_
-             << ", storage resource cap: " << LMCIns->resourceQuota_.storageQuota_;
+  LOG(INFO) << "[License Manager] Resource type: " << resourceType
+            << ", query quota cap: " << LMCIns->resourceQuota_.graphQuota_
+            << ", storage quota cap: " << LMCIns->resourceQuota_.storageQuota_;
 
   if (resourceType == "CPU") {
     return checkNodeCpu(role, host, cpuNum, resourceCap, isHostRegistered, needUpdate);