From e194c0f439191cd3dd547082d402d5104d1f1a92 Mon Sep 17 00:00:00 2001 From: CalvinNeo Date: Mon, 1 Apr 2024 14:48:54 +0800 Subject: [PATCH 1/3] z Signed-off-by: CalvinNeo --- dbms/src/Common/TiFlashMetrics.h | 1 + dbms/src/Storages/KVStore/FFI/ProxyFFI.h | 1 + dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp | 8 ++++++-- dbms/src/Storages/KVStore/Region.cpp | 5 +++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dbms/src/Common/TiFlashMetrics.h b/dbms/src/Common/TiFlashMetrics.h index 4a309eed622..0732b4d2b5a 100644 --- a/dbms/src/Common/TiFlashMetrics.h +++ b/dbms/src/Common/TiFlashMetrics.h @@ -536,6 +536,7 @@ static_assert(RAFT_REGION_BIG_WRITE_THRES * 4 < RAFT_REGION_BIG_WRITE_MAX, "Inva M(tiflash_raft_read_index_events_count, \ "Raft read index events counter", \ Counter, \ + F(type_bypass_lock, {{"type", "bypass_lock"}}), \ F(type_use_histroy, {{"type", "use_histroy"}}), \ F(type_use_cache, {{"type", "use_cache"}})) \ M(tiflash_raft_learner_read_failures_count, \ diff --git a/dbms/src/Storages/KVStore/FFI/ProxyFFI.h b/dbms/src/Storages/KVStore/FFI/ProxyFFI.h index 3b23ba28ed1..13602c77b04 100644 --- a/dbms/src/Storages/KVStore/FFI/ProxyFFI.h +++ b/dbms/src/Storages/KVStore/FFI/ProxyFFI.h @@ -265,6 +265,7 @@ inline EngineStoreServerHelper GetEngineStoreServerHelper(EngineStoreServerWrap .fn_set_store = SetStore, .fn_set_pb_msg_by_bytes = SetPBMsByBytes, .fn_handle_safe_ts_update = HandleSafeTSUpdate, + .fn_get_lock_by_key = GetLockByKey, .fn_fast_add_peer = FastAddPeer, .fn_query_fap_snapshot_state = QueryFapSnapshotState, .fn_clear_fap_snapshot = ClearFapSnapshot, diff --git a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp index 27f05766c9d..c108122f599 100644 --- a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp +++ b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp @@ -228,8 +228,12 @@ DecodedLockCFValuePtr RegionData::getLockInfo(const RegionLockReadQuery & query) continue; if (lock_info.min_commit_ts > query.read_tso) continue; - if (query.bypass_lock_ts && query.bypass_lock_ts->count(lock_info.lock_version)) - continue; + if (query.bypass_lock_ts) { + if (query.bypass_lock_ts->count(lock_info.lock_version)) { + GET_METRIC(tiflash_raft_read_index_events_count, type_bypass_lock).Increment(); + continue; + } + } return lock_info_ptr; } diff --git a/dbms/src/Storages/KVStore/Region.cpp b/dbms/src/Storages/KVStore/Region.cpp index ee1500af1e7..4f29de08e73 100644 --- a/dbms/src/Storages/KVStore/Region.cpp +++ b/dbms/src/Storages/KVStore/Region.cpp @@ -131,14 +131,15 @@ std::string Region::getDebugString() const { const auto & meta_snap = meta.dumpRegionMetaSnapshot(); return fmt::format( - "[region_id={} index={} table_id={} ver={} conf_ver={} state={} peer={}]", + "[region_id={} index={} table_id={} ver={} conf_ver={} state={} peer={} range={}]", id(), meta.appliedIndex(), mapped_table_id, meta_snap.ver, meta_snap.conf_ver, raft_serverpb::PeerState_Name(peerState()), - meta_snap.peer.ShortDebugString()); + meta_snap.peer.ShortDebugString(), + getRange()->toDebugString()); } std::string Region::toString(bool dump_status) const From bec38e30f251e88ab62873a051d4a38a60794bc0 Mon Sep 17 00:00:00 2001 From: CalvinNeo Date: Mon, 1 Apr 2024 15:08:15 +0800 Subject: [PATCH 2/3] z Signed-off-by: CalvinNeo --- dbms/src/Storages/KVStore/FFI/ProxyFFI.h | 2 +- dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dbms/src/Storages/KVStore/FFI/ProxyFFI.h b/dbms/src/Storages/KVStore/FFI/ProxyFFI.h index 13602c77b04..21e1e73808c 100644 --- a/dbms/src/Storages/KVStore/FFI/ProxyFFI.h +++ b/dbms/src/Storages/KVStore/FFI/ProxyFFI.h @@ -265,8 +265,8 @@ inline EngineStoreServerHelper GetEngineStoreServerHelper(EngineStoreServerWrap .fn_set_store = SetStore, .fn_set_pb_msg_by_bytes = SetPBMsByBytes, .fn_handle_safe_ts_update = HandleSafeTSUpdate, - .fn_get_lock_by_key = GetLockByKey, .fn_fast_add_peer = FastAddPeer, + .fn_get_lock_by_key = GetLockByKey, .fn_query_fap_snapshot_state = QueryFapSnapshotState, .fn_clear_fap_snapshot = ClearFapSnapshot, .fn_kvstore_region_exists = KvstoreRegionExists, diff --git a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp index c108122f599..1bf3b908f4f 100644 --- a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp +++ b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include From 11be928520f7945b9186e7806b6041cc3769ecb6 Mon Sep 17 00:00:00 2001 From: CalvinNeo Date: Mon, 1 Apr 2024 15:57:24 +0800 Subject: [PATCH 3/3] f Signed-off-by: CalvinNeo --- dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp index 1bf3b908f4f..66acb0bac07 100644 --- a/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp +++ b/dbms/src/Storages/KVStore/MultiRaft/RegionData.cpp @@ -229,8 +229,10 @@ DecodedLockCFValuePtr RegionData::getLockInfo(const RegionLockReadQuery & query) continue; if (lock_info.min_commit_ts > query.read_tso) continue; - if (query.bypass_lock_ts) { - if (query.bypass_lock_ts->count(lock_info.lock_version)) { + if (query.bypass_lock_ts) + { + if (query.bypass_lock_ts->count(lock_info.lock_version)) + { GET_METRIC(tiflash_raft_read_index_events_count, type_bypass_lock).Increment(); continue; }