From b774aa01dda0567e50e902e91db766c2ef552a73 Mon Sep 17 00:00:00 2001 From: Calvin Neo Date: Mon, 21 Oct 2024 12:49:41 +0800 Subject: [PATCH] Use truncated state to get term at applied_index (#307) Signed-off-by: Calvin Neo --- contrib/tiflash-proxy | 2 +- dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy index a8cb400b4a0..8fb5282ba28 160000 --- a/contrib/tiflash-proxy +++ b/contrib/tiflash-proxy @@ -1 +1 @@ -Subproject commit a8cb400b4a0325838e6c55a2f2e81bb43b864d08 +Subproject commit 8fb5282ba28dad63f3936c268a60d5ea645eb4ed diff --git a/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp b/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp index 15fa7589b38..cb6f2491a7d 100644 --- a/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp +++ b/dbms/src/Storages/KVStore/MultiRaft/Disagg/FastAddPeer.cpp @@ -502,7 +502,8 @@ FastAddPeerRes FastAddPeerImpl( new_peer_id, std::move(std::get(res)), start_time); - GET_METRIC(tiflash_fap_task_result, type_success_transform).Increment(); + if (final_res.status != FastAddPeerStatus::Canceled) + GET_METRIC(tiflash_fap_task_result, type_success_transform).Increment(); return final_res; } return std::get(res);