From 4dad8afd85ef5b6362d434ff10c4db73eb7b97db Mon Sep 17 00:00:00 2001
From: Shylock Hg <33566796+Shylock-Hg@users.noreply.github.com>
Date: Tue, 14 Jul 2020 15:59:17 +0800
Subject: [PATCH] Add the default configuration for gflags flag mode. (#2119)

---
 src/meta/GflagsManager.cpp     | 16 +++++++++++++++-
 src/meta/client/MetaClient.cpp |  1 -
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/meta/GflagsManager.cpp b/src/meta/GflagsManager.cpp
index d47199f50b8..6ab93d50118 100644
--- a/src/meta/GflagsManager.cpp
+++ b/src/meta/GflagsManager.cpp
@@ -29,7 +29,21 @@ std::string GflagsManager::gflagsValueToThriftValue<std::string>(
 
 std::unordered_map<std::string, std::pair<cpp2::ConfigMode, bool>>
 GflagsManager::parseConfigJson(const std::string& path) {
-    std::unordered_map<std::string, std::pair<cpp2::ConfigMode, bool>> configModeMap;
+    // The default conf for gflags flags mode
+    std::unordered_map<std::string, std::pair<cpp2::ConfigMode, bool>> configModeMap {
+        {"max_edge_returned_per_vertex", {cpp2::ConfigMode::MUTABLE, false}},
+        {"minloglevel", {cpp2::ConfigMode::MUTABLE, false}},
+        {"v", {cpp2::ConfigMode::MUTABLE, false}},
+        {"heartbeat_interval_secs", {cpp2::ConfigMode::MUTABLE, false}},
+        {"meta_client_retry_times", {cpp2::ConfigMode::MUTABLE, false}},
+        {"slow_op_threshhold_ms", {cpp2::ConfigMode::MUTABLE, false}},
+        {"wal_ttl", {cpp2::ConfigMode::MUTABLE, false}},
+        {"enable_reservoir_sampling", {cpp2::ConfigMode::MUTABLE, false}},
+
+        {"rocksdb_db_options", {cpp2::ConfigMode::MUTABLE, true}},
+        {"rocksdb_column_family_options", {cpp2::ConfigMode::MUTABLE, true}},
+        {"rocksdb_block_based_table_options", {cpp2::ConfigMode::MUTABLE, true}},
+    };
     Configuration conf;
     if (!conf.parseFromFile(path).ok()) {
         LOG(ERROR) << "Load gflags json failed";
diff --git a/src/meta/client/MetaClient.cpp b/src/meta/client/MetaClient.cpp
index 5b5da0ebe54..8b63dae0444 100644
--- a/src/meta/client/MetaClient.cpp
+++ b/src/meta/client/MetaClient.cpp
@@ -21,7 +21,6 @@ DEFINE_int32(meta_client_retry_times, 3, "meta client retry times, 0 means no re
 DEFINE_int32(meta_client_retry_interval_secs, 1, "meta client sleep interval between retry");
 DEFINE_int32(meta_client_timeout_ms, 60 * 1000, "meta client timeout");
 DEFINE_string(cluster_id_path, "cluster.id", "file path saved clusterId");
-DECLARE_string(gflags_mode_json);
 
 
 namespace nebula {