Revert "Revert "update client-c to support choosing non pending peer …

…when dis…" (#7586)
pingcap · Jun 1, 2023 · 03f3012 · 03f3012
1 parent 90772ef
commit 03f3012
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/contrib/client-c b/contrib/client-c
diff --git a/contrib/kvproto b/contrib/kvproto
diff --git a/dbms/src/Storages/StorageDisaggregatedRemote.cpp b/dbms/src/Storages/StorageDisaggregatedRemote.cpp
@@ -61,28 +61,6 @@
 #include <numeric>
 #include <unordered_set>
 
-namespace pingcap::kv
-{
-// The rpc trait
-template <>
-struct RpcTypeTraits<disaggregated::EstablishDisaggTaskRequest>
-{
-    using RequestType = disaggregated::EstablishDisaggTaskRequest;
-    using ResultType = disaggregated::EstablishDisaggTaskResponse;
-
-    static const char * err_msg() { return "EstablishDisaggTask Failed"; } // NOLINT(readability-identifier-naming)
-
-    static ::grpc::Status doRPCCall(
-        grpc::ClientContext * context,
-        std::shared_ptr<KvConnClient> client,
-        const RequestType & req,
-        ResultType * res)
-    {
-        return client->stub->EstablishDisaggTask(context, req, res);
-    }
-};
-} // namespace pingcap::kv
-
 namespace DB
 {
 

diff --git a/dbms/src/Storages/Transaction/FastAddPeer.cpp b/dbms/src/Storages/Transaction/FastAddPeer.cpp
@@ -128,7 +128,8 @@ FastAddPeerRes genFastAddPeerRes(FastAddPeerStatus status, std::string && apply_
 std::vector<StoreID> getCandidateStoreIDsForRegion(TMTContext & tmt_context, UInt64 region_id, UInt64 current_store_id)
 {
     auto pd_client = tmt_context.getPDClient();
-    auto [region, _] = pd_client->getRegionByID(region_id);
+    auto resp = pd_client->getRegionByID(region_id);
+    const auto & region = resp.region();
     std::vector<StoreID> store_ids;
     store_ids.reserve(region.peers_size());
     for (const auto & peer : region.peers())