Skip to content

Commit

Permalink
fix: Fixed issue with context cancelled error leading to connection s…
Browse files Browse the repository at this point in the history
…pikes on Master
  • Loading branch information
Bhargav Dodla committed Nov 22, 2024
1 parent e63669e commit de69b49
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 9 additions & 0 deletions error.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ type Error interface {

var _ Error = proto.RedisError("")

func isContextError(err error) bool {
switch err {
case context.Canceled, context.DeadlineExceeded:
return true
default:
return false
}
}

func shouldRetry(err error, retryTimeout bool) bool {
switch err {
case io.EOF, io.ErrUnexpectedEOF:
Expand Down
4 changes: 3 additions & 1 deletion osscluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,9 @@ func (c *ClusterClient) processPipelineNode(
_ = node.Client.withProcessPipelineHook(ctx, cmds, func(ctx context.Context, cmds []Cmder) error {
cn, err := node.Client.getConn(ctx)
if err != nil {
node.MarkAsFailing()
if !isContextError(err) {
node.MarkAsFailing()
}
_ = c.mapCmdsByNode(ctx, failedCmds, cmds)
setCmdsErr(cmds, err)
return err
Expand Down

0 comments on commit de69b49

Please sign in to comment.