Skip to content
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

Jump to bottom

tikvclient: adjust log level in store/tikv/client_batch.go (#12302) #12383

Merged
merged 2 commits into from
Sep 25, 2019
Merged

tikvclient: adjust log level in store/tikv/client_batch.go (#12302) #12383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9390a9
tikvclient: adjust log level in store/tikv/client_batch.go (#12302)
hicqu Sep 25, 2019
aecce46
Merge branch 'release-3.0' into release-3.0
hicqu Sep 25, 2019
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
13 changes: 8 additions & 5 deletions store/tikv/client_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ func (c *batchCommandsClient) send(request *tikvpb.BatchCommandsRequest, entries
c.batched.Store(requestID, entries[i])
}
if err := c.client.Send(request); err != nil {
logutil.Logger(context.Background()).Error(
"batch commands send error",
logutil.Logger(context.Background()).Info(
"sending batch commands meets error",
zap.String("target", c.target),
zap.Error(err),
)
Expand Down Expand Up @@ -252,7 +252,7 @@ func (c *batchCommandsClient) reCreateStreamingClientOnce(err error) error {

return nil
}
logutil.Logger(context.Background()).Error(
logutil.Logger(context.Background()).Info(
"batchRecvLoop re-create streaming fail",
zap.String("target", c.target),
zap.Error(err),
Expand All @@ -275,8 +275,11 @@ func (c *batchCommandsClient) batchRecvLoop(cfg config.TiKVClient, tikvTransport
for {
resp, err := c.recv()
if err != nil {
logutil.Logger(context.Background()).Error(
"batchRecvLoop error when receive",
if c.isStopped() {
return
}
logutil.Logger(context.Background()).Info(
"batchRecvLoop fails when receiving, needs to reconnect",
zap.String("target", c.target),
zap.Error(err),
)
Expand Down