Skip to content

KVStore: fix tiflash_raft_throughput_bytes warp problem (#10700) #10705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 2 commits into from
Feb 9, 2026
+21 −10
Merged

KVStore: fix tiflash_raft_throughput_bytes warp problem (#10700) #10705

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e3acf
This is an automated cherry-pick of #10700
CalvinNeo Feb 5, 2026
bd6a580
Resolve conflict
JaySon-Huang Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions dbms/src/Storages/KVStore/MultiRaft/RaftCommands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,22 @@ std::pair<EngineStoreApplyRes, DM::WriteResult> Region::handleWriteRaftCmd(

auto is_v2 = this->getClusterRaftstoreVer() == RaftstoreVer::V2;

auto update_write_size = [&write_size](Int64 payload) {
if (payload > 0)
{
write_size += static_cast<size_t>(payload);
}
else if (payload < 0)
{
// A lock being rewritten could lead to a negative payload.
// Try to turn the negative payload into a positive decrement on `write_size`.
const auto dec = static_cast<size_t>(-(payload + 1)) + 1; // avoid INT64_MIN overflow
if (write_size >= dec)
write_size -= dec;
else
write_size = 0;
}
};
const auto handle_by_index_func = [&](auto i) {
auto type = cmds.cmd_types[i];
auto cf = cmds.cmd_cf[i];
Expand All @@ -371,15 +387,10 @@ std::pair<EngineStoreApplyRes, DM::WriteResult> Region::handleWriteRaftCmd(
}
try
{
if unlikely (is_v2)
{
// There may be orphan default key in a snapshot.
write_size += doInsert(cf, std::move(tikv_key), std::move(tikv_value), DupCheck::AllowSame);
}
else
{
write_size += doInsert(cf, std::move(tikv_key), std::move(tikv_value), DupCheck::Deny);
}
// There may be orphan default key in a snapshot under raftstore v2.
auto dup_check = is_v2 ? DupCheck::AllowSame : DupCheck::Deny;
auto payload = doInsert(cf, std::move(tikv_key), std::move(tikv_value), dup_check);
update_write_size(payload);
}
catch (Exception & e)
{
Expand Down Expand Up @@ -523,4 +534,4 @@ RegionRaftCommandDelegate & Region::makeRaftCommandDelegate(const KVStoreTaskLoc
std::ignore = lock;
return static_cast<RegionRaftCommandDelegate &>(*this);
}
} // namespace DB
} // namespace DB