Merge branch 'master' into cherry

vesoft-inc · Apr 7, 2021 · 4d3a052 · 4d3a052
2 parents e65d8ad + 02bf8aa
commit 4d3a052
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 10 deletions.
diff --git a/src/common/utils/NebulaKeyUtils.cpp b/src/common/utils/NebulaKeyUtils.cpp
@@ -139,6 +139,15 @@ std::string NebulaKeyUtils::indexPrefix(PartitionID partId, IndexID indexId) {
     return key;
 }
 
+// static
+std::string NebulaKeyUtils::indexPrefix(PartitionID partId) {
+    PartitionID item = (partId << kPartitionOffset) | static_cast<uint32_t>(NebulaKeyType::kIndex);
+    std::string key;
+    key.reserve(sizeof(PartitionID));
+    key.append(reinterpret_cast<const char*>(&item), sizeof(PartitionID));
+    return key;
+}
+
 // static
 std::string NebulaKeyUtils::vertexPrefix(PartitionID partId, VertexID vId, TagID tagId) {
     tagId &= kTagMaskSet;
@@ -195,12 +204,18 @@ std::string NebulaKeyUtils::prefix(PartitionID partId) {
 }
 
 // static
-std::string NebulaKeyUtils::snapshotPrefix(PartitionID partId) {
+std::vector<std::string> NebulaKeyUtils::snapshotPrefix(PartitionID partId) {
+    std::vector<std::string> result;
     // snapshot of meta would be all key-value pairs
     if (partId == 0) {
-        return "";
+        result.emplace_back("");
+    } else {
+        result.emplace_back(prefix(partId));
+        result.emplace_back(indexPrefix(partId));
+        // kSystem will be written when balance data
+        // kOperation will be blocked by jobmanager later
     }
-    return prefix(partId);
+    return result;
 }
 
 // static

diff --git a/src/common/utils/NebulaKeyUtils.h b/src/common/utils/NebulaKeyUtils.h
@@ -84,6 +84,8 @@ class NebulaKeyUtils final {
 
     static std::string indexPrefix(PartitionID partId, IndexID indexId);
 
+    static std::string indexPrefix(PartitionID partId);
+
     /**
      * Prefix for
      * */
@@ -111,7 +113,7 @@ class NebulaKeyUtils final {
 
     static std::string prefix(PartitionID partId);
 
-    static std::string snapshotPrefix(PartitionID partId);
+    static std::vector<std::string> snapshotPrefix(PartitionID partId);
 
     static PartitionID getPart(const folly::StringPiece& rawKey) {
         return readInt<PartitionID>(rawKey.data(), sizeof(PartitionID)) >> 8;

diff --git a/src/kvstore/SnapshotManagerImpl.cpp b/src/kvstore/SnapshotManagerImpl.cpp
@@ -16,17 +16,35 @@ void SnapshotManagerImpl::accessAllRowsInSnapshot(GraphSpaceID spaceId,
                                                   PartitionID partId,
                                                   raftex::SnapshotCallback cb) {
     CHECK_NOTNULL(store_);
-    std::unique_ptr<KVIterator> iter;
-    auto prefix = NebulaKeyUtils::snapshotPrefix(partId);
+    auto tables = NebulaKeyUtils::snapshotPrefix(partId);
     std::vector<std::string> data;
     int64_t totalSize = 0;
     int64_t totalCount = 0;
+
+    for (const auto& prefix : tables) {
+        if (!accessTable(spaceId, partId, prefix, cb, data, totalCount, totalSize)) {
+            return;
+        }
+    }
+    cb(data, totalCount, totalSize, raftex::SnapshotStatus::DONE);
+}
+
+// Promise is set in callback. Access part of the data, and try to send to peers. If send failed,
+// will return false.
+bool SnapshotManagerImpl::accessTable(GraphSpaceID spaceId,
+                                      PartitionID partId,
+                                      const std::string& prefix,
+                                      raftex::SnapshotCallback& cb,
+                                      std::vector<std::string>& data,
+                                      int64_t& totalCount,
+                                      int64_t& totalSize) {
+    std::unique_ptr<KVIterator> iter;
     auto ret = store_->prefix(spaceId, partId, prefix, &iter);
     if (ret != ResultCode::SUCCEEDED) {
         LOG(INFO) << "[spaceId:" << spaceId << ", partId:" << partId << "] access prefix failed"
                   << ", error code:" << static_cast<int32_t>(ret);
         cb(data, totalCount, totalSize, raftex::SnapshotStatus::FAILED);
-        return;
+        return false;
     }
     data.reserve(kReserveNum);
     int32_t batchSize = 0;
@@ -37,8 +55,8 @@ void SnapshotManagerImpl::accessAllRowsInSnapshot(GraphSpaceID spaceId,
                 batchSize = 0;
             } else {
                 LOG(INFO) << "[spaceId:" << spaceId << ", partId:" << partId
-                          << "] callback invoked failed";
-                return;
+                          << "] send snapshot failed";
+                return false;
             }
         }
         auto key = iter->key();
@@ -49,7 +67,7 @@ void SnapshotManagerImpl::accessAllRowsInSnapshot(GraphSpaceID spaceId,
         totalCount++;
         iter->next();
     }
-    cb(data, totalCount, totalSize, raftex::SnapshotStatus::DONE);
+    return true;
 }
 }  // namespace kvstore
 }  // namespace nebula

diff --git a/src/kvstore/SnapshotManagerImpl.h b/src/kvstore/SnapshotManagerImpl.h
@@ -23,6 +23,14 @@ class SnapshotManagerImpl : public raftex::SnapshotManager {
                                  raftex::SnapshotCallback cb) override;
 
 private:
+    bool accessTable(GraphSpaceID spaceId,
+                     PartitionID partId,
+                     const std::string& prefix,
+                     raftex::SnapshotCallback& cb,
+                     std::vector<std::string>& data,
+                     int64_t& totalCount,
+                     int64_t& totalSize);
+
     KVStore* store_;
 };