Skip to content

improvements #3577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndyakov merged 7 commits into from
Nov 5, 2025
Merged

improvements #3577

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ed0256
improvements
manisharma Nov 2, 2025
00332b2
linter fixes
manisharma Nov 3, 2025
0d52843
prevention on unnecessary allocations in case of bad configuration
manisharma Nov 3, 2025
5978acf
Merge branch 'master' into master
ndyakov Nov 3, 2025
bb43ec7
Test/Benchmark, old code with safety harness preventing panic
manisharma Nov 5, 2025
92e957a
Merge branch 'redis:master' into master
manisharma Nov 5, 2025
420d095
Merge branch 'master' of github.com:manisharma/go-redis
manisharma Nov 5, 2025
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
18 changes: 13 additions & 5 deletions sentinel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/redis/go-redis/v9/internal"
"github.com/redis/go-redis/v9/internal/pool"
"github.com/redis/go-redis/v9/internal/rand"
"github.com/redis/go-redis/v9/internal/util"
"github.com/redis/go-redis/v9/push"
)

Expand Down Expand Up @@ -843,6 +842,11 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
}
}

// short circuit if no sentinels configured
if len(c.sentinelAddrs) == 0 {
return "", errors.New("redis: no sentinels configured")
}

var (
masterAddr string
wg sync.WaitGroup
Expand Down Expand Up @@ -890,16 +894,20 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
}

func joinErrors(errs []error) string {
if len(errs) == 0 {
return ""
}
if len(errs) == 1 {
return errs[0].Error()
}

b := []byte(errs[0].Error())
var b strings.Builder
b.WriteString(errs[0].Error())
for _, err := range errs[1:] {
b = append(b, '\n')
b = append(b, err.Error()...)
b.WriteByte('\n')
b.WriteString(err.Error())
}
return util.BytesToString(b)
return b.String()
Comment thread
ndyakov marked this conversation as resolved.
Outdated
}

func (c *sentinelFailover) replicaAddrs(ctx context.Context, useDisconnected bool) ([]string, error) {
Expand Down
Loading