database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a race about re-create batch-commands client (#10143)

Browse Source
This commit is contained in:
qupeng
2019-04-17 11:47:43 +08:00
committed by GitHub
parent 7666f688b3
commit 44cbb237f2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
store/tikv/client.go
View File

@ -133,13 +133,16 @@ func (c *batchCommandsClient) batchRecvLoop(cfg config.TiKVClient) {
}
logutil.Logger(context.Background()).Error("batchRecvLoop error when receive", zap.Error(err))
// Hold the lock to forbid batchSendLoop using the old client.
c.clientLock.Lock()
c.failPendingRequests(err) // fail all pending requests.
for { // try to re-create the streaming in the loop.
for { // try to re-create the streaming in the loop.
// Hold the lock to forbid batchSendLoop using the old client.
c.clientLock.Lock()
c.failPendingRequests(err) // fail all pending requests.
// Re-establish a application layer stream. TCP layer is handled by gRPC.
tikvClient := tikvpb.NewTikvClient(c.conn)
streamClient, err := tikvClient.BatchCommands(context.TODO())
c.clientLock.Unlock()
if err == nil {
logutil.Logger(context.Background()).Info("batchRecvLoop re-create streaming success")
c.client = streamClient
@ -149,7 +152,6 @@ func (c *batchCommandsClient) batchRecvLoop(cfg config.TiKVClient) {
// TODO: Use a more smart backoff strategy.
time.Sleep(time.Second)
}
c.clientLock.Unlock()
continue
}