Skip to content

Commit

Permalink
Merge branch 'master' into client/temp_fix2
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot[bot] authored Mar 1, 2024
2 parents 2e413ca + 42d0a3f commit 92f4887
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions client/tso_dispatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ tsoBatchLoop:
} else {
log.Error("[tso] fetch pending tso requests error",
zap.String("dc-location", dc),
errs.ZapError(errs.ErrClientGetTSO, err))
zap.Error(errs.ErrClientGetTSO.FastGenByArgs(err.Error())))
}
return
}
Expand Down Expand Up @@ -513,7 +513,7 @@ tsoBatchLoop:
log.Error("[tso] getTS error after processing requests",
zap.String("dc-location", dc),
zap.String("stream-addr", streamAddr),
errs.ZapError(errs.ErrClientGetTSO, err))
zap.Error(errs.ErrClientGetTSO.FastGenByArgs(err.Error())))
// Set `stream` to nil and remove this stream from the `connectionCtxs` due to error.
connectionCtxs.Delete(streamAddr)
cancel()
Expand Down

0 comments on commit 92f4887

Please sign in to comment.