Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/stores/redis/breakerhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ import (

red "github.com/redis/go-redis/v9"
"github.com/zeromicro/go-zero/core/breaker"
"github.com/zeromicro/go-zero/core/lang"
)

var ignoreCmds = map[string]lang.PlaceholderType{
"blpop": {},
}

type breakerHook struct {
brk breaker.Breaker
}
Expand All @@ -34,6 +29,12 @@ func (h breakerHook) ProcessHook(next red.ProcessHook) red.ProcessHook {

func (h breakerHook) ProcessPipelineHook(next red.ProcessPipelineHook) red.ProcessPipelineHook {
return func(ctx context.Context, cmds []red.Cmder) error {
for _, cmd := range cmds {
if _, ok := ignoreCmds[cmd.Name()]; ok {
return next(ctx, cmds)
}
}

return h.brk.DoWithAcceptableCtx(ctx, func() error {
return next(ctx, cmds)
}, acceptable)
Expand Down
10 changes: 10 additions & 0 deletions core/stores/redis/redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
red "github.com/redis/go-redis/v9"
"github.com/zeromicro/go-zero/core/breaker"
"github.com/zeromicro/go-zero/core/errorx"
"github.com/zeromicro/go-zero/core/lang"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/mapping"
"github.com/zeromicro/go-zero/core/syncx"
Expand All @@ -33,6 +34,9 @@ var (
// ErrNilNode is an error that indicates a nil redis node.
ErrNilNode = errors.New("nil redis node")
slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold)
ignoreCmds = map[string]lang.PlaceholderType{
"blpop": {},
}
)

type (
Expand Down Expand Up @@ -2580,6 +2584,12 @@ func SetSlowThreshold(threshold time.Duration) {
slowThreshold.Set(threshold)
}

func SetIgnoreCmds(cmds ...string) {
for _, cmd := range cmds {
ignoreCmds[cmd] = lang.Placeholder
}
}

// WithHook customizes the given Redis with given durationHook.
func WithHook(hook Hook) Option {
return func(r *Redis) {
Expand Down
9 changes: 9 additions & 0 deletions core/stores/redis/redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2029,6 +2029,15 @@ func TestSetSlowThreshold(t *testing.T) {
assert.Equal(t, time.Second, slowThreshold.Load())
}

func TestSetIgnoreCmds(t *testing.T) {
SetIgnoreCmds("hello")
_, ok := ignoreCmds["hello"]
assert.True(t, ok)

_, ok = ignoreCmds["client"]
assert.False(t, ok)
}

func TestRedis_WithUserPass(t *testing.T) {
runOnRedis(t, func(client *Redis) {
err := newRedis(client.Addr, WithUser("any"), WithPass("any")).Ping()
Expand Down
Loading