Skip to content

Commit 526cbf7

Browse files
author
haodedu
committed
add EvictDiskReplica metrics to MasterMetricManager
1 parent 2e4ca00 commit 526cbf7

3 files changed

Lines changed: 40 additions & 2 deletions

File tree

mooncake-store/include/master_metric_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,8 @@ class MasterMetricManager {
241241
void inc_move_end_failures(int64_t val = 1);
242242
void inc_move_revoke_requests(int64_t val = 1);
243243
void inc_move_revoke_failures(int64_t val = 1);
244+
void inc_evict_disk_replica_requests(int64_t val = 1);
245+
void inc_evict_disk_replica_failures(int64_t val = 1);
244246

245247
// CopyStart, CopyEnd, CopyRevoke, MoveStart, MoveEnd, MoveRevoke Metrics
246248
// Getters
@@ -256,6 +258,8 @@ class MasterMetricManager {
256258
int64_t get_move_end_failures();
257259
int64_t get_move_revoke_requests();
258260
int64_t get_move_revoke_failures();
261+
int64_t get_evict_disk_replica_requests();
262+
int64_t get_evict_disk_replica_failures();
259263

260264
// Copy, Move, QueryTask, FetchTasks, MarkTaskToComplete Metrics
261265
void inc_create_copy_task_requests(int64_t val = 1);
@@ -440,6 +444,8 @@ class MasterMetricManager {
440444
ylt::metric::counter_t move_end_failures_;
441445
ylt::metric::counter_t move_revoke_requests_;
442446
ylt::metric::counter_t move_revoke_failures_;
447+
ylt::metric::counter_t evict_disk_replica_requests_;
448+
ylt::metric::counter_t evict_disk_replica_failures_;
443449

444450
// Copy and Move, FetchTasks, MarkTaskToComplete Metrics
445451
ylt::metric::counter_t create_copy_task_requests_;

mooncake-store/src/master_metric_manager.cpp

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,12 @@ MasterMetricManager::MasterMetricManager()
287287
"Total number of MoveRevoke requests received"),
288288
move_revoke_failures_("master_move_revoke_failures_total",
289289
"Total number of failed MoveRevoke requests"),
290+
evict_disk_replica_requests_(
291+
"master_evict_disk_replica_requests_total",
292+
"Total number of EvictDiskReplica requests received"),
293+
evict_disk_replica_failures_(
294+
"master_evict_disk_replica_failures_total",
295+
"Total number of failed EvictDiskReplica requests"),
290296

291297
/*
292298
* Initialize CreateMoveTask, CreateCopyTask, QueryTask, FetchTasks,
@@ -385,6 +391,8 @@ void MasterMetricManager::update_metrics_for_zero_output() {
385391
move_end_failures_.inc(0);
386392
move_revoke_requests_.inc(0);
387393
move_revoke_failures_.inc(0);
394+
evict_disk_replica_requests_.inc(0);
395+
evict_disk_replica_failures_.inc(0);
388396

389397
// Update Batch Request Counters
390398
batch_exist_key_requests_.inc(0);
@@ -1137,6 +1145,12 @@ void MasterMetricManager::inc_move_revoke_requests(int64_t val) {
11371145
void MasterMetricManager::inc_move_revoke_failures(int64_t val) {
11381146
move_revoke_failures_.inc(val);
11391147
}
1148+
void MasterMetricManager::inc_evict_disk_replica_requests(int64_t val) {
1149+
evict_disk_replica_requests_.inc(val);
1150+
}
1151+
void MasterMetricManager::inc_evict_disk_replica_failures(int64_t val) {
1152+
evict_disk_replica_failures_.inc(val);
1153+
}
11401154

11411155
// CopyStart, CopyEnd, CopyRevoke, MoveStart, MoveEnd, MoveRevoke Metrics
11421156
// Getters
@@ -1176,6 +1190,12 @@ int64_t MasterMetricManager::get_move_revoke_requests() {
11761190
int64_t MasterMetricManager::get_move_revoke_failures() {
11771191
return move_revoke_failures_.value();
11781192
}
1193+
int64_t MasterMetricManager::get_evict_disk_replica_requests() {
1194+
return evict_disk_replica_requests_.value();
1195+
}
1196+
int64_t MasterMetricManager::get_evict_disk_replica_failures() {
1197+
return evict_disk_replica_failures_.value();
1198+
}
11791199

11801200
// Task create, query, fetch Metrics
11811201
void MasterMetricManager::inc_create_copy_task_requests(int64_t val) {
@@ -1311,6 +1331,8 @@ std::string MasterMetricManager::serialize_metrics() {
13111331
serialize_metric(move_end_failures_);
13121332
serialize_metric(move_revoke_requests_);
13131333
serialize_metric(move_revoke_failures_);
1334+
serialize_metric(evict_disk_replica_requests_);
1335+
serialize_metric(evict_disk_replica_failures_);
13141336

13151337
// Serialize CreateCopyTask, CreateMoveTask, MarkTaskToComplete, QueryTask,
13161338
// FetchTasks Request Counters
@@ -1473,6 +1495,8 @@ std::string MasterMetricManager::get_summary_string() {
14731495
int64_t move_end_fails = move_end_failures_.value();
14741496
int64_t move_revokes = move_revoke_requests_.value();
14751497
int64_t move_revoke_fails = move_revoke_failures_.value();
1498+
int64_t evict_disk_replicas = evict_disk_replica_requests_.value();
1499+
int64_t evict_disk_replica_fails = evict_disk_replica_failures_.value();
14761500

14771501
// Batch request counters
14781502
int64_t batch_put_start_requests = batch_put_start_requests_.value();
@@ -1578,7 +1602,10 @@ std::string MasterMetricManager::get_summary_string() {
15781602
<< ", ";
15791603
ss << "MoveEnd=" << move_ends - move_end_fails << "/" << move_ends << ", ";
15801604
ss << "MoveRevoke=" << move_revokes - move_revoke_fails << "/"
1581-
<< move_revokes;
1605+
<< move_revokes << ", ";
1606+
ss << "EvictDiskReplica="
1607+
<< evict_disk_replicas - evict_disk_replica_fails << "/"
1608+
<< evict_disk_replicas;
15821609

15831610
// Batch request summary
15841611
ss << " | Batch Requests "

mooncake-store/src/rpc_service.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,12 @@ tl::expected<void, ErrorCode> WrappedMasterService::EvictDiskReplica(
818818
timer.LogRequest("client_id=", client_id, ", key=", key,
819819
", replica_type=", replica_type);
820820
},
821-
[] {}, [] {});
821+
[] {
822+
MasterMetricManager::instance().inc_evict_disk_replica_requests();
823+
},
824+
[] {
825+
MasterMetricManager::instance().inc_evict_disk_replica_failures();
826+
});
822827
}
823828

824829
tl::expected<UUID, ErrorCode> WrappedMasterService::CreateCopyTask(

0 commit comments

Comments
 (0)