Make some FAP metrics more clear (pingcap#322)

Signed-off-by: Calvin Neo <calvinneo1995@gmail.com>
JaySon-Huang · Dec 3, 2024 · 8333d4f · 8333d4f
1 parent 0a7ffb4
commit 8333d4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dbms/src/Common/TiFlashMetrics.h b/dbms/src/Common/TiFlashMetrics.h
@@ -396,6 +396,7 @@ namespace DB
       F(type_failed_other, {{"type", "failed_other"}}),                                                                             \
       F(type_failed_cancel, {{"type", "failed_cancel"}}),                                                                           \
       F(type_failed_no_suitable, {{"type", "failed_no_suitable"}}),                                                                 \
+      F(type_failed_no_candidate, {{"type", "failed_no_candidate"}}),                                                               \
       F(type_failed_timeout, {{"type", "failed_timeout"}}),                                                                         \
       F(type_failed_baddata, {{"type", "failed_baddata"}}),                                                                         \
       F(type_failed_repeated, {{"type", "failed_repeated"}}),                                                                       \

diff --git a/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp b/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp
@@ -228,7 +228,7 @@ std::variant<CheckpointRegionInfoAndData, FastAddPeerRes> FastAddPeerImplSelect(
     if (candidate_store_ids.empty())
     {
         LOG_DEBUG(log, "No suitable candidate peer for region_id={}", region_id);
-        GET_METRIC(tiflash_fap_task_result, type_failed_no_suitable).Increment();
+        GET_METRIC(tiflash_fap_task_result, type_failed_no_candidate).Increment();
         return genFastAddPeerResFail(FastAddPeerStatus::NoSuitable);
     }
     LOG_DEBUG(log, "Begin to select checkpoint for region_id={}", region_id);
@@ -707,6 +707,7 @@ FastAddPeerRes FastAddPeer(EngineStoreServerWrap * server, uint64_t region_id, u
             // We need to schedule the task.
             auto current_time = FAPAsyncTasks::getCurrentMillis();
             GET_METRIC(tiflash_fap_task_state, type_queueing_stage).Increment();
+            GET_METRIC(tiflash_fap_task_result, type_total).Increment();
             auto job_func = [server, region_id, new_peer_id, fap_ctx, current_time]() {
                 std::string origin_name = getThreadName();
                 SCOPE_EXIT({ setThreadName(origin_name.c_str()); });
@@ -760,7 +761,6 @@ FastAddPeerRes FastAddPeer(EngineStoreServerWrap * server, uint64_t region_id, u
                 new_peer_id,
                 region_id,
                 elapsed);
-            GET_METRIC(tiflash_fap_task_result, type_total).Increment();
             GET_METRIC(tiflash_fap_task_duration_seconds, type_phase1_total).Observe(elapsed / 1000.0);
             return result;
         }