GetProperty

vesoft-inc · Sep 14, 2021 · efcbed5 · efcbed5
1 parent 4c53153
commit efcbed5
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 0 deletions.
diff --git a/src/kvstore/KVEngine.h b/src/kvstore/KVEngine.h
@@ -111,6 +111,10 @@ class KVEngine {
   virtual nebula::cpp2::ErrorCode setDBOption(const std::string& configKey,
                                               const std::string& configValue) = 0;
 
+  // Get DB Property
+  virtual ErrorOr<nebula::cpp2::ErrorCode, std::string> getProperty(
+      const std::string& property) = 0;
+
   virtual nebula::cpp2::ErrorCode compact() = 0;
 
   virtual nebula::cpp2::ErrorCode flush() = 0;

diff --git a/src/kvstore/KVStore.h b/src/kvstore/KVStore.h
@@ -216,6 +216,9 @@ class KVStore {
 
   virtual std::vector<std::string> getDataRoot() const = 0;
 
+  virtual ErrorOr<nebula::cpp2::ErrorCode, std::string> getProperty(
+      GraphSpaceID spaceId, const std::string& property) = 0;
+
  protected:
   KVStore() = default;
 };

diff --git a/src/kvstore/NebulaStore.cpp b/src/kvstore/NebulaStore.cpp
@@ -1168,5 +1168,26 @@ nebula::cpp2::ErrorCode NebulaStore::multiPutWithoutReplicator(GraphSpaceID spac
   return nebula::cpp2::ErrorCode::SUCCEEDED;
 }
 
+ErrorOr<nebula::cpp2::ErrorCode, std::string> NebulaStore::getProperty(
+    GraphSpaceID spaceId, const std::string& property) {
+  auto spaceRet = space(spaceId);
+  if (!ok(spaceRet)) {
+    LOG(ERROR) << "Get Space " << spaceId << " Failed";
+    return error(spaceRet);
+  }
+  auto space = nebula::value(spaceRet);
+
+  folly::dynamic obj = folly::dynamic::object;
+  for (size_t i = 0; i < space->engines_.size(); i++) {
+    auto val = space->engines_[i]->getProperty(property);
+    if (!ok(val)) {
+      return error(val);
+    }
+    auto eng = folly::stringPrintf("Engine %zu", i);
+    obj[eng] = std::move(value(val));
+  }
+  return folly::toJson(obj);
+}
+
 }  // namespace kvstore
 }  // namespace nebula
diff --git a/src/kvstore/NebulaStore.h b/src/kvstore/NebulaStore.h
@@ -273,6 +273,9 @@ class NebulaStore : public KVStore, public Handler {
   nebula::cpp2::ErrorCode multiPutWithoutReplicator(GraphSpaceID spaceId,
                                                     std::vector<KV> keyValues) override;
 
+  ErrorOr<nebula::cpp2::ErrorCode, std::string> getProperty(GraphSpaceID spaceId,
+                                                            const std::string& property) override;
+
  private:
   void loadPartFromDataPath();
 

diff --git a/src/kvstore/RocksEngine.cpp b/src/kvstore/RocksEngine.cpp
@@ -424,6 +424,16 @@ nebula::cpp2::ErrorCode RocksEngine::setDBOption(const std::string& configKey,
   }
 }
 
+ErrorOr<nebula::cpp2::ErrorCode, std::string> RocksEngine::getProperty(
+    const std::string& property) {
+  std::string value;
+  if (!db_->GetProperty(property, &value)) {
+    return nebula::cpp2::ErrorCode::E_INVALID_PARM;
+  } else {
+    return value;
+  }
+}
+
 nebula::cpp2::ErrorCode RocksEngine::compact() {
   rocksdb::CompactRangeOptions options;
   options.change_level = FLAGS_rocksdb_compact_change_level;

diff --git a/src/kvstore/RocksEngine.h b/src/kvstore/RocksEngine.h
@@ -168,6 +168,8 @@ class RocksEngine : public KVEngine {
   nebula::cpp2::ErrorCode setDBOption(const std::string& configKey,
                                       const std::string& configValue) override;
 
+  ErrorOr<nebula::cpp2::ErrorCode, std::string> getProperty(const std::string& property) override;
+
   nebula::cpp2::ErrorCode compact() override;
 
   nebula::cpp2::ErrorCode flush() override;

diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
@@ -62,6 +62,7 @@ nebula_add_library(
     http/StorageHttpDownloadHandler.cpp
     http/StorageHttpAdminHandler.cpp
     http/StorageHttpStatsHandler.cpp
+    http/StorageHttpPropertyHandler.cpp
 )
 
 nebula_add_library(

diff --git a/src/storage/StorageServer.cpp b/src/storage/StorageServer.cpp
@@ -25,6 +25,7 @@
 #include "storage/http/StorageHttpAdminHandler.h"
 #include "storage/http/StorageHttpDownloadHandler.h"
 #include "storage/http/StorageHttpIngestHandler.h"
+#include "storage/http/StorageHttpPropertyHandler.h"
 #include "storage/http/StorageHttpStatsHandler.h"
 #include "storage/transaction/TransactionManager.h"
 #include "version/Version.h"
@@ -104,6 +105,9 @@ bool StorageServer::initWebService() {
   router.get("/rocksdb_stats").handler([](web::PathParams&&) {
     return new storage::StorageHttpStatsHandler();
   });
+  router.get("/rocksdb_property").handler([this](web::PathParams&&) {
+    return new storage::StorageHttpPropertyHandler(schemaMan_.get(), kvstore_.get());
+  });
 
   auto status = webSvc_->start();
   return status.ok();

diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt
@@ -511,6 +511,23 @@ nebula_add_test(
         gtest
 )
 
+nebula_add_test(
+    NAME
+        storage_http_property_test
+    SOURCES
+        StorageHttpPropertyHandlerTest.cpp
+    OBJECTS
+        $<TARGET_OBJECTS:storage_http_handler>
+        $<TARGET_OBJECTS:ws_obj>
+        ${storage_test_deps}
+    LIBRARIES
+        ${ROCKSDB_LIBRARIES}
+        ${THRIFT_LIBRARIES}
+        ${PROXYGEN_LIBRARIES}
+        wangle
+        gtest
+)
+
 nebula_add_test(
     NAME
         scan_edge_test