Skip to content

Commit 2ca3eb3

Browse files
authored
Merge branch 'master' into feat/improve_success_rate_of_new_connections
2 parents 00e381d + a15e763 commit 2ca3eb3

File tree

37 files changed

+1156
-161
lines changed

37 files changed

+1156
-161
lines changed

auth/reauth_credentials_listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ func NewReAuthCredentialsListener(reAuth func(credentials Credentials) error, on
4444
}
4545

4646
// Ensure ReAuthCredentialsListener implements the CredentialsListener interface.
47-
var _ CredentialsListener = (*ReAuthCredentialsListener)(nil)
47+
var _ CredentialsListener = (*ReAuthCredentialsListener)(nil)

error.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,12 @@ func isRedisError(err error) bool {
108108

109109
func isBadConn(err error, allowTimeout bool, addr string) bool {
110110
switch err {
111-
case nil:
112-
return false
113-
case context.Canceled, context.DeadlineExceeded:
114-
return true
111+
case nil:
112+
return false
113+
case context.Canceled, context.DeadlineExceeded:
114+
return true
115+
case pool.ErrConnUnusableTimeout:
116+
return true
115117
}
116118

117119
if isRedisError(err) {

example/del-keys-without-ttl/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
replace github.com/redis/go-redis/v9 => ../..
66

77
require (
8-
github.com/redis/go-redis/v9 v9.15.1
8+
github.com/redis/go-redis/v9 v9.16.0-beta.1
99
go.uber.org/zap v1.24.0
1010
)
1111

example/hll/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.15.1
7+
require github.com/redis/go-redis/v9 v9.16.0-beta.1
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.3.0 // indirect

example/hset-struct/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
66

77
require (
88
github.com/davecgh/go-spew v1.1.1
9-
github.com/redis/go-redis/v9 v9.15.1
9+
github.com/redis/go-redis/v9 v9.16.0-beta.1
1010
)
1111

1212
require (

example/lua-scripting/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.15.1
7+
require github.com/redis/go-redis/v9 v9.16.0-beta.1
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.3.0 // indirect

example/otel/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ replace github.com/redis/go-redis/extra/redisotel/v9 => ../../extra/redisotel
1111
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../../extra/rediscmd
1212

1313
require (
14-
github.com/redis/go-redis/extra/redisotel/v9 v9.15.1
15-
github.com/redis/go-redis/v9 v9.15.1
14+
github.com/redis/go-redis/extra/redisotel/v9 v9.16.0-beta.1
15+
github.com/redis/go-redis/v9 v9.16.0-beta.1
1616
github.com/uptrace/uptrace-go v1.21.0
1717
go.opentelemetry.io/otel v1.22.0
1818
)
@@ -25,7 +25,7 @@ require (
2525
github.com/go-logr/stdr v1.2.2 // indirect
2626
github.com/golang/protobuf v1.5.3 // indirect
2727
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
28-
github.com/redis/go-redis/extra/rediscmd/v9 v9.15.1 // indirect
28+
github.com/redis/go-redis/extra/rediscmd/v9 v9.16.0-beta.1 // indirect
2929
go.opentelemetry.io/contrib/instrumentation/runtime v0.46.1 // indirect
3030
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
3131
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect

example/redis-bloom/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
replace github.com/redis/go-redis/v9 => ../..
66

7-
require github.com/redis/go-redis/v9 v9.15.1
7+
require github.com/redis/go-redis/v9 v9.16.0-beta.1
88

99
require (
1010
github.com/cespare/xxhash/v2 v2.3.0 // indirect

example/scan-struct/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
66

77
require (
88
github.com/davecgh/go-spew v1.1.1
9-
github.com/redis/go-redis/v9 v9.15.1
9+
github.com/redis/go-redis/v9 v9.16.0-beta.1
1010
)
1111

1212
require (

extra/rediscensus/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
77
replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
88

99
require (
10-
github.com/redis/go-redis/extra/rediscmd/v9 v9.15.1
11-
github.com/redis/go-redis/v9 v9.15.1
10+
github.com/redis/go-redis/extra/rediscmd/v9 v9.16.0-beta.1
11+
github.com/redis/go-redis/v9 v9.16.0-beta.1
1212
go.opencensus.io v0.24.0
1313
)
1414

0 commit comments

Comments
 (0)