fix comments

vesoft-inc · Dec 1, 2021 · ca00e75 · ca00e75
1 parent bdccbf7
commit ca00e75
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -2415,7 +2415,7 @@ folly::Future<StatusOr<bool>> MetaClient::heartbeat() {
       req.set_leader_partIds(std::move(leaderIds));
     }
 
-    kvstore::DiskParts diskParts;
+    kvstore::SpaceDiskPartsMap diskParts;
     if (listener_ != nullptr) {
       listener_->fetchDiskParts(diskParts);
       if (diskParts_ != diskParts) {

diff --git a/src/clients/meta/MetaClient.h b/src/clients/meta/MetaClient.h
@@ -163,7 +163,7 @@ class MetaChangedListener {
   virtual void onPartUpdated(const PartHosts& partHosts) = 0;
   virtual void fetchLeaderInfo(
       std::unordered_map<GraphSpaceID, std::vector<cpp2::LeaderInfo>>& leaders) = 0;
-  virtual void fetchDiskParts(kvstore::DiskParts& diskParts) = 0;
+  virtual void fetchDiskParts(kvstore::SpaceDiskPartsMap& diskParts) = 0;
   virtual void onListenerAdded(GraphSpaceID spaceId,
                                PartitionID partId,
                                const ListenerHosts& listenerHosts) = 0;
@@ -732,11 +732,12 @@ class MetaClient {
   std::shared_ptr<folly::IOThreadPoolExecutor> ioThreadPool_;
   std::shared_ptr<thrift::ThriftClientManager<cpp2::MetaServiceAsyncClient>> clientsMan_;
 
+  // heartbeat is a single thread, maybe leaderIdsLock_ and diskPartsLock_ is unuseful?
   // leaderIdsLock_ is used to protect leaderIds_
   std::unordered_map<GraphSpaceID, std::vector<cpp2::LeaderInfo>> leaderIds_;
   folly::RWSpinLock leaderIdsLock_;
   // diskPartsLock_ is used to protect diskParts_;
-  kvstore::DiskParts diskParts_;
+  kvstore::SpaceDiskPartsMap diskParts_;
   folly::RWSpinLock diskPartsLock_;
 
   std::atomic<int64_t> localDataLastUpdateTime_{-1};

diff --git a/src/kvstore/DiskManager.cpp b/src/kvstore/DiskManager.cpp
@@ -94,7 +94,7 @@ void DiskManager::removePartFromPath(GraphSpaceID spaceId,
   }
 }
 
-void DiskManager::getDiskParts(DiskParts& diskParts) {
+void DiskManager::getDiskParts(SpaceDiskPartsMap& diskParts) {
   std::lock_guard<std::mutex> lg(lock_);
   for (const auto& [space, partDiskMap] : partPath_) {
     std::unordered_map<std::string, meta::cpp2::PartitionList> tmpPartPaths;

diff --git a/src/kvstore/DiskManager.h b/src/kvstore/DiskManager.h
@@ -21,7 +21,7 @@ namespace nebula {
 namespace kvstore {
 
 using PartDiskMap = std::unordered_map<std::string, std::set<PartitionID>>;
-using DiskParts =
+using SpaceDiskPartsMap =
     std::unordered_map<GraphSpaceID, std::unordered_map<std::string, meta::cpp2::PartitionList>>;
 
 class DiskManager {
@@ -56,7 +56,7 @@ class DiskManager {
   StatusOr<PartDiskMap> partDist(GraphSpaceID spaceId);
 
   // Get all space data path and all partition in the path
-  void getDiskParts(DiskParts& diskParts);
+  void getDiskParts(SpaceDiskPartsMap& diskParts);
 
  private:
   // refresh free bytes of data path periodically

diff --git a/src/kvstore/NebulaStore.cpp b/src/kvstore/NebulaStore.cpp
@@ -537,7 +537,9 @@ void NebulaStore::checkRemoteListeners(GraphSpaceID spaceId,
   }
 }
 
-void NebulaStore::fetchDiskParts(DiskParts& diskParts) { diskMan_->getDiskParts(diskParts); }
+void NebulaStore::fetchDiskParts(SpaceDiskPartsMap& diskParts) {
+  diskMan_->getDiskParts(diskParts);
+}
 
 void NebulaStore::updateSpaceOption(GraphSpaceID spaceId,
                                     const std::unordered_map<std::string, std::string>& options,

diff --git a/src/kvstore/NebulaStore.h b/src/kvstore/NebulaStore.h
@@ -272,7 +272,7 @@ class NebulaStore : public KVStore, public Handler {
                             PartitionID partId,
                             const std::vector<HostAddr>& remoteListeners) override;
 
-  void fetchDiskParts(DiskParts& diskParts) override;
+  void fetchDiskParts(SpaceDiskPartsMap& diskParts) override;
 
   nebula::cpp2::ErrorCode multiPutWithoutReplicator(GraphSpaceID spaceId,
                                                     std::vector<KV> keyValues) override;

diff --git a/src/kvstore/PartManager.cpp b/src/kvstore/PartManager.cpp
@@ -190,7 +190,7 @@ void MetaServerBasedPartManager::fetchLeaderInfo(
   }
 }
 
-void MetaServerBasedPartManager::fetchDiskParts(DiskParts& diskParts) {
+void MetaServerBasedPartManager::fetchDiskParts(SpaceDiskPartsMap& diskParts) {
   if (handler_ != nullptr) {
     handler_->fetchDiskParts(diskParts);
   } else {

diff --git a/src/kvstore/PartManager.h b/src/kvstore/PartManager.h
@@ -35,9 +35,6 @@ class Handler {
 
   virtual void removePart(GraphSpaceID spaceId, PartitionID partId) = 0;
 
-  virtual int32_t allLeader(
-      std::unordered_map<GraphSpaceID, std::vector<meta::cpp2::LeaderInfo>>& leaderIds) = 0;
-
   virtual void addListener(GraphSpaceID spaceId,
                            PartitionID partId,
                            meta::cpp2::ListenerType type,
@@ -51,7 +48,11 @@ class Handler {
                                     PartitionID partId,
                                     const std::vector<HostAddr>& remoteListeners) = 0;
 
-  virtual void fetchDiskParts(DiskParts& diskParts) = 0;
+  // get infos from handler(nebula store) to listener(meta_client -> meta)
+  virtual int32_t allLeader(
+      std::unordered_map<GraphSpaceID, std::vector<meta::cpp2::LeaderInfo>>& leaderIds) = 0;
+
+  virtual void fetchDiskParts(SpaceDiskPartsMap& diskParts) = 0;
 };
 
 /**
@@ -213,7 +214,7 @@ class MetaServerBasedPartManager : public PartManager, public meta::MetaChangedL
   void fetchLeaderInfo(
       std::unordered_map<GraphSpaceID, std::vector<meta::cpp2::LeaderInfo>>& leaderParts) override;
 
-  void fetchDiskParts(DiskParts& diskParts) override;
+  void fetchDiskParts(SpaceDiskPartsMap& diskParts) override;
 
   void onListenerAdded(GraphSpaceID spaceId,
                        PartitionID partId,

diff --git a/src/meta/processors/admin/HBProcessor.cpp b/src/meta/processors/admin/HBProcessor.cpp
@@ -51,6 +51,7 @@ void HBProcessor::process(const cpp2::HBReq& req) {
           std::string key = MetaKeyUtils::diskPartsKey(host, spaceId, path);
           std::vector<kvstore::KV> data;
           data.emplace_back(key, partListVal);
+          // doPut() not work, will trigger the asan: use heap memory which is free
           folly::Baton<true, std::atomic> baton;
           kvstore_->asyncMultiPut(kDefaultSpaceId,
                                   kDefaultPartId,

diff --git a/src/meta/test/MetaClientTest.cpp b/src/meta/test/MetaClientTest.cpp
@@ -1544,7 +1544,7 @@ class TestListener : public MetaChangedListener {
     UNUSED(remoteListeners);
   }
 
-  void fetchDiskParts(kvstore::DiskParts& diskParts) override {
+  void fetchDiskParts(kvstore::SpaceDiskPartsMap& diskParts) override {
     UNUSED(diskParts);
     LOG(INFO) << "Fetch Disk Paths";
   }