From bcc692a62be4694c434833a5156f9a2e04e6bd4b Mon Sep 17 00:00:00 2001 From: pingcap-github-bot Date: Wed, 20 May 2020 15:15:15 +0800 Subject: [PATCH] store/tikv: do not send batch commands to tiflash (#17282) (#17307) --- store/tikv/client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/store/tikv/client.go b/store/tikv/client.go index fbff332eb71b3..5f80aea85a29d 100644 --- a/store/tikv/client.go +++ b/store/tikv/client.go @@ -317,7 +317,8 @@ func (c *rpcClient) SendRequest(ctx context.Context, addr string, req *tikvrpc.R c.recycleIdleConnArray() } - enableBatch := req.StoreTp != kv.TiDB + // TiDB will not send batch commands to TiFlash, to resolve the conflict with Batch Cop Request. + enableBatch := req.StoreTp != kv.TiDB && req.StoreTp != kv.TiFlash connArray, err := c.getConnArray(addr, enableBatch) if err != nil { return nil, errors.Trace(err)