From 2b11e41443b2810174fe4b83df4b7da578fd0fdd Mon Sep 17 00:00:00 2001 From: shuaihehe <2728551637@qq.com> Date: Fri, 1 Dec 2023 10:19:44 +0800 Subject: [PATCH] 3 --- .../src/client/kvclient/kvclient_manager.cpp | 17 +++++------------ curvefs/src/client/metric/client_metric.h | 8 +++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/curvefs/src/client/kvclient/kvclient_manager.cpp b/curvefs/src/client/kvclient/kvclient_manager.cpp index 00dcf5936a..b72a356fa6 100644 --- a/curvefs/src/client/kvclient/kvclient_manager.cpp +++ b/curvefs/src/client/kvclient/kvclient_manager.cpp @@ -53,11 +53,6 @@ bool KVClientManager::Init(const KVClientManagerOpt& config, const std::string& fsName) { client_ = kvclient; kvClientManagerMetric_ = absl::make_unique(fsName); - brpc::StartDummyServerAt(9000); - getQueueSize_.expose("getQueueSize_"); - setQueueSize_.expose("setQueueSize_"); - getQueueSize_.reset(); - setQueueSize_.reset(); return threadPool_.Start(config.setThreadPooln) == 0; } @@ -69,11 +64,11 @@ void KVClientManager::Uninit() { void KVClientManager::Set(std::shared_ptr task) { threadPool_.Enqueue([task, this]() { std::string error_log; - setQueueSize_ << 1; + kvClientManagerMetric_->setQueueSize << 1; task->res = client_->Set(task->key, task->value, task->length, &error_log); - if (task->res) { - setQueueSize_ << -1; + kvClientManagerMetric_->setQueueSize << -1; + if (task->res) { kvClientManagerMetric_->count << 1; } OnReturn(&kvClientManagerMetric_->set, task); @@ -106,13 +101,11 @@ void KVClientManager::Get(std::shared_ptr task) { threadPool_.Enqueue([task, this]() { std::string error_log; memcached_return_t retCode; - getQueueSize_ << 1; + kvClientManagerMetric_->getQueueSize << 1; task->res = client_->Get(task->key, task->value, task->offset, task->valueLength, &error_log, &task->length, &retCode); - if (task->res) { - getQueueSize_ << -1; - } + kvClientManagerMetric_->getQueueSize << -1; UpdateHitMissMetric(retCode, kvClientManagerMetric_.get()); OnReturn(&kvClientManagerMetric_->get, task); }); diff --git a/curvefs/src/client/metric/client_metric.h b/curvefs/src/client/metric/client_metric.h index bfbf0f3373..3253287ff9 100644 --- a/curvefs/src/client/metric/client_metric.h +++ b/curvefs/src/client/metric/client_metric.h @@ -317,6 +317,10 @@ struct KVClientManagerMetric { bvar::Adder hit; // kvcache miss bvar::Adder miss; + // kvcache getQueueSize + bvar::Adder getQueueSize; + // kvcache setQueueSize + bvar::Adder setQueueSize; explicit KVClientManagerMetric(const std::string& name = "") : fsName(!name.empty() ? name @@ -325,7 +329,9 @@ struct KVClientManagerMetric { set(prefix, fsName + "_set"), count(prefix, fsName + "_count"), hit(prefix, fsName + "_hit"), - miss(prefix, fsName + "_miss") {} + miss(prefix, fsName + "_miss"), + getQueueSize(prefix, fsName + "_getQueueSize"), + setQueueSize(prefix, fsName + "_setQueueSize") {} }; struct MemcacheClientMetric {