Skip to content
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

perf: reduce goroutines used by DoMulti/DoMultiCache in a cluster client #699

Merged
merged 1 commit into from
Dec 14, 2024
Merged

perf: reduce goroutines used by DoMulti/DoMultiCache in a cluster client #699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 26 additions & 6 deletions cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,16 +544,16 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry) {

if !init && c.rslots != nil && c.opt.SendToReplicas != nil {
for _, cmd := range multi {
var p conn
var cc conn
if c.opt.SendToReplicas(cmd) {
p = c.rslots[cmd.Slot()]
cc = c.rslots[cmd.Slot()]
} else {
p = c.pslots[cmd.Slot()]
cc = c.pslots[cmd.Slot()]
}
if p == nil {
if cc == nil {
return nil
}
count.m[p]++
count.m[cc]++
}

retries = connretryp.Get(len(count.m), len(count.m))
Expand All @@ -569,7 +569,9 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry) {
} else {
cc = c.pslots[cmd.Slot()]
}

if cc == nil { // check cc == nil again in case of non-deterministic SendToReplicas.
return nil
}
re := retries.m[cc]
re.commands = append(re.commands, cmd)
re.cIndexes = append(re.cIndexes, i)
Expand Down Expand Up @@ -726,13 +728,22 @@ func (c *clusterClient) DoMulti(ctx context.Context, multi ...Completed) []Redis
retry:
retries.RetryDelay = -1 // Assume no retry. Because client retry flag can be set to false.

var cc1 conn
var re1 *retry
wg.Add(len(retries.m))
mu.Lock()
for cc, re := range retries.m {
delete(retries.m, cc)
cc1 = cc
re1 = re
break
}
for cc, re := range retries.m {
delete(retries.m, cc)
go c.doretry(ctx, cc, results, retries, re, &mu, &wg, attempts)
}
mu.Unlock()
c.doretry(ctx, cc1, results, retries, re1, &mu, &wg, attempts)
wg.Wait()

if len(retries.m) != 0 {
Expand Down Expand Up @@ -997,13 +1008,22 @@ func (c *clusterClient) DoMultiCache(ctx context.Context, multi ...CacheableTTL)
retry:
retries.RetryDelay = -1 // Assume no retry. Because client retry flag can be set to false.

var cc1 conn
var re1 *retrycache
wg.Add(len(retries.m))
mu.Lock()
for cc, re := range retries.m {
delete(retries.m, cc)
cc1 = cc
re1 = re
break
}
for cc, re := range retries.m {
delete(retries.m, cc)
go c.doretrycache(ctx, cc, results, retries, re, &mu, &wg, attempts)
}
mu.Unlock()
c.doretrycache(ctx, cc1, results, retries, re1, &mu, &wg, attempts)
wg.Wait()

if len(retries.m) != 0 {
Expand Down
Loading