mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2375 from monkey92t/defer-releaseConn 

fix(conn): releaseConn should be executed correctly
This commit is contained in:
Vladimir Mihailenco 2023-01-30 08:51:46 +02:00 committed by GitHub
parent 805bfc2c60 21e1954745
commit 2b9bd23c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cluster.go
View File

@ -1287,9 +1287,13 @@ func (c *ClusterClient) processPipelineNode(
return err
}
err = c.processPipelineNodeConn(ctx, node, cn, cmds, failedCmds)
node.Client.releaseConn(ctx, cn, err)
return err
var processErr error
defer func() {
node.Client.releaseConn(ctx, cn, processErr)
}()
processErr = c.processPipelineNodeConn(ctx, node, cn, cmds, failedCmds)
return processErr
})
}
@ -1464,9 +1468,13 @@ func (c *ClusterClient) processTxPipelineNode(
return err
}
err = c.processTxPipelineNodeConn(ctx, node, cn, cmds, failedCmds)
node.Client.releaseConn(ctx, cn, err)
return err
var processErr error
defer func() {
node.Client.releaseConn(ctx, cn, processErr)
}()
processErr = c.processTxPipelineNodeConn(ctx, node, cn, cmds, failedCmds)
return processErr
})
}

11
redis.go
View File

@ -342,9 +342,14 @@ func (c *baseClient) withConn(
return err
}
err = fn(ctx, cn)
c.releaseConn(ctx, cn, err)
return err
var fnErr error
defer func() {
c.releaseConn(ctx, cn, fnErr)
}()
fnErr = fn(ctx, cn)
return fnErr
}
func (c *baseClient) dial(ctx context.Context, network, addr string) (net.Conn, error) {