add kv stats

rebase on upstream/master address @darionyaphet's comments
vesoft-inc · Oct 12, 2019 · 58c63b0 · 58c63b0
1 parent 6a1d432
commit 58c63b0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/src/storage/BaseProcessor.h b/src/storage/BaseProcessor.h
@@ -98,16 +98,6 @@ class BaseProcessor {
  }
  }
 
- void pushResultCode(cpp2::ErrorCode code, PartitionID partId, HostAddr leader) {
- if (code != cpp2::ErrorCode::SUCCEEDED) {
- cpp2::ResultCode thriftRet;
- thriftRet.set_code(code);
- thriftRet.set_part_id(partId);
- thriftRet.set_leader(toThriftHost(leader));
- result_.failed_codes.emplace_back(std::move(thriftRet));
- }
- }
-
  nebula::cpp2::HostAddr toThriftHost(const HostAddr& host) {
  nebula::cpp2::HostAddr tHost;
  tHost.set_ip(host.first);

diff --git a/src/storage/GetProcessor.h b/src/storage/GetProcessor.h
@@ -17,16 +17,20 @@ class GetProcessor : public BaseProcessor<cpp2::GeneralResponse> {
 public:
  static GetProcessor* instance(kvstore::KVStore* kvstore,
  meta::SchemaManager* schemaMan,
+ StorageStats* stats,
  folly::Executor* executor) {
- return new GetProcessor(kvstore, schemaMan, executor);
+ return new GetProcessor(kvstore, schemaMan, stats, executor);
  }
 
  void process(const cpp2::GetRequest& req);
 
 protected:
- explicit GetProcessor(kvstore::KVStore* kvstore, meta::SchemaManager* schemaMan,
- folly::Executor* executor = nullptr)
- : BaseProcessor<cpp2::GeneralResponse>(kvstore, schemaMan), executor_(executor) {}
+ explicit GetProcessor(kvstore::KVStore* kvstore,
+ meta::SchemaManager* schemaMan,
+ StorageStats* stats,
+ folly::Executor* executor = nullptr):
+ BaseProcessor<cpp2::GeneralResponse>(kvstore, schemaMan, stats),
+ executor_(executor) {}
 
 private:
  folly::Future<std::pair<PartitionID, kvstore::ResultCode>>

diff --git a/src/storage/PutProcessor.h b/src/storage/PutProcessor.h
@@ -16,15 +16,18 @@ namespace storage {
 class PutProcessor : public BaseProcessor<cpp2::ExecResponse> {
 public:
  static PutProcessor* instance(kvstore::KVStore* kvstore,
- meta::SchemaManager* schemaMan) {
- return new PutProcessor(kvstore, schemaMan);
+ meta::SchemaManager* schemaMan,
+ StorageStats* stats) {
+ return new PutProcessor(kvstore, schemaMan, stats);
  }
 
  void process(const cpp2::PutRequest& req);
 
 private:
- explicit PutProcessor(kvstore::KVStore* kvstore, meta::SchemaManager* schemaMan)
- : BaseProcessor<cpp2::ExecResponse>(kvstore, schemaMan) {}
+ explicit PutProcessor(kvstore::KVStore* kvstore,
+ meta::SchemaManager* schemaMan,
+ StorageStats* stats)
+ : BaseProcessor<cpp2::ExecResponse>(kvstore, schemaMan, stats) {}
 };
 
 } // namespace storage

diff --git a/src/storage/StorageServiceHandler.cpp b/src/storage/StorageServiceHandler.cpp
@@ -149,13 +149,16 @@ StorageServiceHandler::future_getLeaderPart(const cpp2::GetLeaderReq& req) {
 
 folly::Future<cpp2::ExecResponse>
 StorageServiceHandler::future_put(const cpp2::PutRequest& req) {
- auto* processor = PutProcessor::instance(kvstore_, schemaMan_);
+ auto* processor = PutProcessor::instance(kvstore_, schemaMan_, &putKvQpsStat_);
  RETURN_FUTURE(processor);
 }
 
 folly::Future<cpp2::GeneralResponse>
 StorageServiceHandler::future_get(const cpp2::GetRequest& req) {
- auto* processor = GetProcessor::instance(kvstore_, schemaMan_, getThreadManager());
+ auto* processor = GetProcessor::instance(kvstore_,
+ schemaMan_,
+ &getKvQpsStat_,
+ getThreadManager());
  RETURN_FUTURE(processor);
 }
 

diff --git a/src/storage/StorageServiceHandler.h b/src/storage/StorageServiceHandler.h
@@ -37,6 +37,8 @@ class StorageServiceHandler final : public cpp2::StorageServiceSvIf {
  delVertexQpsStat_ = StorageStats("del_vertex");
  updateVertexQpsStat_ = StorageStats("update_vertex");
  updateEdgeQpsStat_ = StorageStats("update_edge");
+ getKvQpsStat_ = StorageStats("get_kv");
+ putKvQpsStat_ = StorageStats("put_kv");
  }
 
  folly::Future<cpp2::QueryResponse>
@@ -117,6 +119,8 @@ class StorageServiceHandler final : public cpp2::StorageServiceSvIf {
  StorageStats delVertexQpsStat_;
  StorageStats updateVertexQpsStat_;
  StorageStats updateEdgeQpsStat_;
+ StorageStats getKvQpsStat_;
+ StorageStats putKvQpsStat_;
 };
 
 } // namespace storage

diff --git a/src/tools/storage-perf/StorageIntegrityTool.cpp b/src/tools/storage-perf/StorageIntegrityTool.cpp
@@ -193,7 +193,7 @@ class IntegrityTest {
  tag.set_props(writer.encode());
  tags.emplace_back(std::move(tag));
 
- v.set_tags(tags);
+ v.set_tags(std::move(tags));
  vertices.emplace_back(std::move(v));
  VLOG(2) << "Build " << cur[i] << " -> " << prev[i];
  PLOG_EVERY_N(INFO, 10000) << "We have inserted " << vId - firstVertexId_ - width_
@@ -218,7 +218,7 @@ class IntegrityTest {
  auto resp = std::move(future).get();
  if (!resp.succeeded()) {
  LOG(ERROR) << "Failed to fetch props of vertex " << nextId;
- break;
+ return false;
  }
  auto& results = resp.responses();
  // get tag schema