redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-31 05:04:23 +03:00
Code Activity

Add proper SingleConnPool implementation

Browse Source
This commit is contained in:
Vladimir Mihailenco
2019-08-03 17:21:12 +03:00
parent d6a99e7be3
commit 4e9cea8876
7 changed files with 212 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cluster.go
View File

@ -787,7 +787,7 @@ func (c *ClusterClient) process(ctx context.Context, cmd Cmder) error {
}
// If slave is loading - pick another node.
if c.opt.ReadOnly && internal.IsLoadingError(err) {
if c.opt.ReadOnly && isLoadingError(err) {
node.MarkAsFailing()
node = nil
continue
@ -795,7 +795,7 @@ func (c *ClusterClient) process(ctx context.Context, cmd Cmder) error {
var moved bool
var addr string
moved, ask, addr = internal.IsMovedError(err)
moved, ask, addr = isMovedError(err)
if moved || ask {
node, err = c.nodes.Get(addr)
if err != nil {
@ -804,12 +804,12 @@ func (c *ClusterClient) process(ctx context.Context, cmd Cmder) error {
continue
}
if err == pool.ErrClosed || internal.IsReadOnlyError(err) {
if err == pool.ErrClosed || isReadOnlyError(err) {
node = nil
continue
}
if internal.IsRetryableError(err, true) {
if isRetryableError(err, true) {
// First retry the same node.
if attempt == 0 {
continue
@ -1173,9 +1173,9 @@ func (c *ClusterClient) pipelineReadCmds(
continue
}
if c.opt.ReadOnly && internal.IsLoadingError(err) {
if c.opt.ReadOnly && isLoadingError(err) {
node.MarkAsFailing()
} else if internal.IsRedisError(err) {
} else if isRedisError(err) {
continue
}
@ -1192,7 +1192,7 @@ func (c *ClusterClient) pipelineReadCmds(
func (c *ClusterClient) checkMovedErr(
cmd Cmder, err error, failedCmds *cmdsMap,
) bool {
moved, ask, addr := internal.IsMovedError(err)
moved, ask, addr := isMovedError(err)
if moved {
c.state.LazyReload()
@ -1346,7 +1346,7 @@ func (c *ClusterClient) txPipelineReadQueued(
continue
}
if c.checkMovedErr(cmd, err, failedCmds) || internal.IsRedisError(err) {
if c.checkMovedErr(cmd, err, failedCmds) || isRedisError(err) {
continue
}
@ -1418,7 +1418,7 @@ func (c *ClusterClient) WatchContext(ctx context.Context, fn func(*Tx) error, ke
c.state.LazyReload()
}
moved, ask, addr := internal.IsMovedError(err)
moved, ask, addr := isMovedError(err)
if moved || ask {
node, err = c.nodes.Get(addr)
if err != nil {
@ -1427,7 +1427,7 @@ func (c *ClusterClient) WatchContext(ctx context.Context, fn func(*Tx) error, ke
continue
}
if err == pool.ErrClosed || internal.IsReadOnlyError(err) {
if err == pool.ErrClosed || isReadOnlyError(err) {
node, err = c.slotMasterNode(slot)
if err != nil {
return err
@ -1435,7 +1435,7 @@ func (c *ClusterClient) WatchContext(ctx context.Context, fn func(*Tx) error, ke
continue
}
if internal.IsRetryableError(err, true) {
if isRetryableError(err, true) {
continue
}