Skip to content

KVStore: neglect TransferLeader for nextgen compatibility #10737

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 6 commits into from
Mar 10, 2026
+19 −3
Merged

KVStore: neglect TransferLeader for nextgen compatibility #10737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67309fa
a
CalvinNeo Mar 10, 2026
f27e905
a
CalvinNeo Mar 10, 2026
7e1aa7d
a
CalvinNeo Mar 10, 2026
3140a40
Update dbms/src/Storages/KVStore/MultiRaft/RaftCommandsKVS.cpp
CalvinNeo Mar 10, 2026
2835e49
Update proxy to downgrade logging level
JaySon-Huang Mar 10, 2026
0fd63d0
Format codes
JaySon-Huang Mar 10, 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
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy
Open in desktop
Submodule tiflash-proxy updated 1 files
+1 −1 proxy_components/engine_store_ffi/src/core/forward_raft/command.rs
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy-next-gen
Open in desktop
Submodule tiflash-proxy-next-gen updated from 10e55d to 113679
4 changes: 4 additions & 0 deletions dbms/src/Storages/KVStore/MultiRaft/RaftCommandsKVS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ EngineStoreApplyRes KVStore::handleAdminRaftCmd(
case raft_cmdpb::AdminCmdType::PrepareFlashback:
case raft_cmdpb::AdminCmdType::FinishFlashback:
case raft_cmdpb::AdminCmdType::BatchSwitchWitness:
// Initialy, with tiflash-proxy, TransferLeader will be rewrited into empty write cmd,
// so this case is not possible. However, tiflash-proxy-next-gen will dispatch the TransferLeader to tiflash, so we have to workaround here.
case raft_cmdpb::AdminCmdType::TransferLeader:
case raft_cmdpb::AdminCmdType::UpdateGcPeer:
return handleUselessAdminRaftCmd(type, curr_region_id, index, term, tmt);
default:
break;
Expand Down
14 changes: 13 additions & 1 deletion dbms/src/Storages/KVStore/tests/gtest_new_kvstore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,23 @@ try
ctx.getTMTContext()),
EngineStoreApplyRes::None);

request.set_cmd_type(::raft_cmdpb::AdminCmdType::TransferLeader);
response = response2;
ASSERT_EQ(
kvs.handleAdminRaftCmd(
raft_cmdpb::AdminRequest{request},
std::move(response),
region_id,
26,
6,
ctx.getTMTContext()),
EngineStoreApplyRes::None);

{
kvs.debugGetConfigMut().debugSetCompactLogConfig(0, 0, 0, 0);
request.set_cmd_type(::raft_cmdpb::AdminCmdType::CompactLog);
ASSERT_EQ(
kvs.handleAdminRaftCmd(std::move(request), std::move(response2), region_id, 26, 6, ctx.getTMTContext()),
kvs.handleAdminRaftCmd(std::move(request), std::move(response2), region_id, 27, 6, ctx.getTMTContext()),
EngineStoreApplyRes::Persist);
}
}
Expand Down