From 2d30a83ffa9508fd0468a708cdb0579327f788da Mon Sep 17 00:00:00 2001 From: pingcap-github-bot Date: Sun, 26 Apr 2020 17:57:09 +0800 Subject: [PATCH] [FLASH-1131] Proxy merge tikv 3.1 & Support raft cmd AdminCmdType::Split (#665) (#667) - Proxy merge pingcap/release-3.1 until (tikv#7543) - Raft cmd `AdminCmdType::Split` has been deprecated but it was reused in latest tikv. issue https://github.com/tikv/tikv/issues/7653 Signed-off-by: Tong Zhigao --- contrib/tiflash-proxy | 2 +- dbms/src/Storages/Transaction/Region.cpp | 1 + release-centos7/build/build-tiflash-ci.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy index 3b0917ef623..146b2b417dd 160000 --- a/contrib/tiflash-proxy +++ b/contrib/tiflash-proxy @@ -1 +1 @@ -Subproject commit 3b0917ef6237e7321cf202b9c586139c9a4061d9 +Subproject commit 146b2b417dd15b9ad6ae877fca3e0469b3a91829 diff --git a/dbms/src/Storages/Transaction/Region.cpp b/dbms/src/Storages/Transaction/Region.cpp index c484c81d137..65de4f394dc 100644 --- a/dbms/src/Storages/Transaction/Region.cpp +++ b/dbms/src/Storages/Transaction/Region.cpp @@ -303,6 +303,7 @@ void RegionRaftCommandDelegate::handleAdminRaftCmd(const raft_cmdpb::AdminReques break; } + case raft_cmdpb::AdminCmdType::Split: case raft_cmdpb::AdminCmdType::BatchSplit: { result.ori_region_range = meta.makeRaftCommandDelegate().regionState().getRange(); diff --git a/release-centos7/build/build-tiflash-ci.sh b/release-centos7/build/build-tiflash-ci.sh index 18596253021..ea030e271ba 100755 --- a/release-centos7/build/build-tiflash-ci.sh +++ b/release-centos7/build/build-tiflash-ci.sh @@ -41,7 +41,7 @@ mkdir -p ${SRCPATH}/libs/libtiflash-proxy # upload: curl -F builds/pingcap/tiflash-proxy/{commit-hash}/libtiflash_proxy.so=@libtiflash_proxy.so http://fileserver.pingcap.net/upload curl -o "${SRCPATH}/libs/libtiflash-proxy/libtiflash_proxy.so" \ -http://fileserver.pingcap.net/download/builds/pingcap/tiflash-proxy/3b0917ef6237e7321cf202b9c586139c9a4061d9/libtiflash_proxy.so +http://fileserver.pingcap.net/download/builds/pingcap/tiflash-proxy/146b2b417dd15b9ad6ae877fca3e0469b3a91829/libtiflash_proxy.so chmod 0731 "${SRCPATH}/libs/libtiflash-proxy/libtiflash_proxy.so" build_dir="$SRCPATH/release-centos7/build-release"