CreateBackup: backup IncrementalId as well (#526)

* CreateBackup: backup IncrementId as well * remove static declaration Co-authored-by: CBS <[email protected]>
vesoft-inc · Jul 16, 2021 · 0dfa699 · 0dfa699
1 parent 79e03de
commit 0dfa699
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/meta/MetaServiceUtils.cpp b/src/meta/MetaServiceUtils.cpp
@@ -25,7 +25,9 @@ static const std::unordered_map<std::string, std::pair<std::string, bool>> syste
     {"groups", {"__groups__", true}},
     {"zones", {"__zones__", true}},
     {"ft_service", {"__ft_service__", false}},
-    {"sessions", {"__sessions__", true}}};
+    {"sessions", {"__sessions__", true}},
+    {"id", {"__id__", true}}
+    };
 
 // name => {prefix, parseSpaceid}, nullptr means that the backup should be skipped.
 static const std::unordered_map<
@@ -80,6 +82,8 @@ const std::string kFTIndexTable        = tableMaps.at("ft_index").first;
 const std::string kFTServiceTable = systemTableMaps.at("ft_service").first;      // NOLINT
 const std::string kSessionsTable = systemTableMaps.at("sessions").first;         // NOLINT
 
+const std::string kIdKey = systemTableMaps.at("id").first;                       // NOLINT
+
 const int kMaxIpAddrLen = 15;   // '255.255.255.255'
 
 namespace {
@@ -1007,6 +1011,10 @@ std::string MetaServiceUtils::genTimestampStr() {
     return ch;
 }
 
+std::string MetaServiceUtils::idKey() {
+    return kIdKey;
+}
+
 std::function<bool(const folly::StringPiece& key)>
 MetaServiceUtils::spaceFilter(const std::unordered_set<GraphSpaceID>& spaces,
                               std::function<GraphSpaceID(folly::StringPiece rawKey)> parseSpace) {

diff --git a/src/meta/MetaServiceUtils.h b/src/meta/MetaServiceUtils.h
@@ -353,6 +353,8 @@ class MetaServiceUtils final {
     static GraphSpaceID parseIndexKeySpaceID(folly::StringPiece key);
     static GraphSpaceID parseDefaultKeySpaceID(folly::StringPiece key);
 
+    static std::string idKey();
+
     // backup
     static ErrorOr<nebula::cpp2::ErrorCode, std::vector<std::string>> backupIndex(
         kvstore::KVStore* kvstore,

diff --git a/src/meta/processors/BaseProcessor.inl b/src/meta/processors/BaseProcessor.inl
@@ -155,7 +155,7 @@ ErrorOr<nebula::cpp2::ErrorCode, std::vector<HostAddr>> BaseProcessor<RESP>::all
 template<typename RESP>
 ErrorOr<nebula::cpp2::ErrorCode, int32_t> BaseProcessor<RESP>::autoIncrementId() {
     folly::SharedMutex::WriteHolder holder(LockUtils::idLock());
-    static const std::string kIdKey = "__id__";
+    const std::string kIdKey = MetaServiceUtils::idKey();
     int32_t id;
     std::string val;
     auto ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, kIdKey, &val);