Skip to content

Commit

Permalink
[NOJIRA-000]add pool dynamic
Browse files Browse the repository at this point in the history
  • Loading branch information
RonninSaga committed Jun 28, 2024
1 parent f08994f commit d962bdb
Show file tree
Hide file tree
Showing 2 changed files with 350 additions and 0 deletions.
271 changes: 271 additions & 0 deletions cluster_dynamic.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
package redis

import (
"context"
"crypto/tls"
"runtime"
"time"

"github.com/redis/go-redis/v9/internal"
)

// NewDynamicClusterClient is similar to NewClusterClient, but it supports dynamic connection pool management
// in exiting clients if NewClient option is not specific in ClusterOptions
func NewDynamicClusterClient(opt *ClusterOptions) *ClusterClient {
if opt.NewClient == nil {
opt.NewClient = NewDynamicClient
}

return NewClusterClient(opt)
}

func (c *ClusterClient) SetMaxRedirects(maxRedirects int) {
if maxRedirects == -1 {
maxRedirects = 0
} else if maxRedirects == 0 {
maxRedirects = 3
}

c.opt.MaxRedirects = maxRedirects
}

func (c *ClusterClient) SetReadOnly(readOnly bool) {
c.opt.ReadOnly = readOnly
}

func (c *ClusterClient) SetRouteByLatency(routeByLatency bool) {
if routeByLatency {
c.opt.ReadOnly = true
for _, node := range c.nodes.nodes {
go node.updateLatency()
}
}
c.opt.RouteByLatency = routeByLatency
}

func (c *ClusterClient) SetRouteRandomly(routeRandomly bool) {
if routeRandomly {
c.opt.ReadOnly = true
}
c.opt.RouteRandomly = routeRandomly
}

func (c *ClusterClient) SetUsername(username string) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetUsername(username)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetUsername failed: %s", err)
return
}

c.opt.Username = username
}

func (c *ClusterClient) SetPassword(password string) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetPassword(password)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetPassword failed: %s", err)
return
}

c.opt.Password = password
}

func (c *ClusterClient) SetMaxRetries(maxRetries int) {
if maxRetries == 0 {
maxRetries = -1
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetMaxRetries(maxRetries)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetMaxRetries failed: %s", err)
return
}

c.opt.MaxRetries = maxRetries
}

func (c *ClusterClient) SetMinRetryBackoff(minRetryBackoff time.Duration) {
if minRetryBackoff == -1 {
minRetryBackoff = 0
} else if minRetryBackoff == 0 {
minRetryBackoff = 8 * time.Millisecond
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetMinRetryBackoff(minRetryBackoff)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetMinRetryBackoff failed: %s", err)
return
}

c.opt.MinRetryBackoff = minRetryBackoff
}

func (c *ClusterClient) SetMaxRetryBackoff(maxRetryBackoff time.Duration) {
if maxRetryBackoff == -1 {
maxRetryBackoff = 0
} else if maxRetryBackoff == 0 {
maxRetryBackoff = 512 * time.Millisecond
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetMaxRetryBackoff(maxRetryBackoff)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetMaxRetryBackoff failed: %s", err)
return
}

c.opt.MaxRetryBackoff = maxRetryBackoff
}

func (c *ClusterClient) SetDialTimeout(dialTimeout time.Duration) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetDialTimeout(dialTimeout)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetDialTimeout failed: %s", err)
return
}

c.opt.DialTimeout = dialTimeout
}

func (c *ClusterClient) SetReadTimeout(readTimeout time.Duration) {
if readTimeout == -1 {
readTimeout = 0
} else if readTimeout == 0 {
readTimeout = 3 * time.Second
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetReadTimeout(readTimeout)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetReadTimeout failed: %s", err)
return
}

c.opt.ReadTimeout = readTimeout
}

func (c *ClusterClient) SetWriteTimeout(writeTimeout time.Duration) {
if writeTimeout == -1 {
writeTimeout = 0
} else if writeTimeout == 0 {
writeTimeout = c.opt.ReadTimeout
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetWriteTimeout(writeTimeout)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetWriteTimeout failed: %s", err)
return
}

c.opt.WriteTimeout = writeTimeout
}

func (c *ClusterClient) SetPoolFIFO(poolFIFO bool) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetPoolFIFO(poolFIFO)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetPoolFIFO failed: %s", err)
return
}

c.opt.PoolFIFO = poolFIFO
}

func (c *ClusterClient) SetPoolSize(poolSize int) {
if poolSize == 0 {
poolSize = 5 * runtime.GOMAXPROCS(0)
}

if err := c.applyUpdateFn(func(client *Client) {
client.SetPoolSize(poolSize)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetPoolSize failed: %s", err)
return
}

c.opt.PoolSize = poolSize
}

func (c *ClusterClient) SetMinIdleConns(minIdleConns int) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetMinIdleConns(minIdleConns)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetMinIdleConns failed: %s", err)
return
}

c.opt.MinIdleConns = minIdleConns
}

func (c *ClusterClient) SetMaxIdleConns(maxIdleConns int) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetMaxIdleConns(maxIdleConns)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetMaxIdleConns failed: %s", err)
return
}

c.opt.MaxIdleConns = maxIdleConns
}

func (c *ClusterClient) SetConnMaxLifetime(connMaxLifetime time.Duration) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetConnMaxLifetime(connMaxLifetime)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetConnMaxLifetimefailed: %s", err)
return
}

c.opt.ConnMaxLifetime = connMaxLifetime
}

func (c *ClusterClient) SetPoolTimeout(poolTimeout time.Duration) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetPoolTimeout(poolTimeout)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetPoolTimeout failed: %s", err)
return
}

c.opt.PoolTimeout = poolTimeout
}

func (c *ClusterClient) SetConnMaxIdleTimeout(idleTimeout time.Duration) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetConnMaxIdleTime(idleTimeout)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetIdleTimeout failed: %s", err)
return
}

c.opt.ConnMaxIdleTime = idleTimeout
}

func (c *ClusterClient) SetTLSConfig(tlsConfig *tls.Config) {
if err := c.applyUpdateFn(func(client *Client) {
client.SetTLSConfig(tlsConfig)
}); err != nil {
internal.Logger.Printf(context.Background(), "SetTLSConfig failed: %s", err)
return
}

c.opt.TLSConfig = tlsConfig
}

func (c *ClusterClient) applyUpdateFn(fn func(client *Client)) error {
nodes, err := c.nodes.All()
if err != nil {
return err
}

for _, node := range nodes {
fn(node.Client)
}
return nil
}
79 changes: 79 additions & 0 deletions cluster_dynamic_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package redis_test

import (
"context"
"log"
"time"

. "github.com/bsm/ginkgo/v2"
. "github.com/bsm/gomega"

"github.com/redis/go-redis/v9"
)

var _ = Describe("Dynamic ClusterClient", func() {
var client *redis.ClusterClient

Context("retry", func() {
timePingRequest := func() time.Duration {
now := time.Now()
err := client.Ping(ctx).Err()
Expect(err).To(HaveOccurred())
return time.Since(now)
}

const normalRedirects, normalMinBackoff, normalMaxBackoff = 3, time.Millisecond * 8, time.Millisecond * 512

BeforeEach(func() {
client = redis.NewDynamicClusterClient(&redis.ClusterOptions{
Addrs: []string{":1234"},
MaxRedirects: normalRedirects,
MinRetryBackoff: normalMinBackoff,
MaxRetryBackoff: normalMaxBackoff,
ClusterSlots: func(ctx context.Context) ([]redis.ClusterSlot, error) {
return []redis.ClusterSlot{{
Start: 0,
End: 16383,
Nodes: []redis.ClusterNode{{
Addr: ":1234",
},
}}}, nil
},
})
})

AfterEach(func() {
Expect(client.Close()).NotTo(HaveOccurred())
})

It("maxRedirects update", func() {
elapseNormalRedirect := timePingRequest()

client.SetMaxRedirects(-1)
elapseNoRedirects := timePingRequest()
Expect(elapseNormalRedirect).To(BeNumerically(">", elapseNoRedirects, 10*time.Millisecond))

client.SetMaxRedirects(normalRedirects * 2)
elapseMoreRedirects := timePingRequest()
Expect(elapseMoreRedirects).To(BeNumerically(">", elapseNormalRedirect, 10*time.Millisecond))

log.Println("redirect elapsed", elapseNoRedirects, elapseNormalRedirect, elapseMoreRedirects)
})

It("retries backoff update", func() {
elapseNormalRedirect := timePingRequest()

client.SetMinRetryBackoff(normalMinBackoff / 2)
client.SetMaxRetryBackoff(normalMaxBackoff / 2)
elapseLessRetryBackoff := timePingRequest()

client.SetMinRetryBackoff(normalMinBackoff * 2)
client.SetMaxRetryBackoff(normalMaxBackoff * 2)
elapseMoreRedirectBackoff := timePingRequest()

log.Println("backoff elapsed", elapseLessRetryBackoff, elapseNormalRedirect, elapseMoreRedirectBackoff)
Expect(elapseNormalRedirect).To(BeNumerically(">", elapseLessRetryBackoff, 10*time.Millisecond))
Expect(elapseMoreRedirectBackoff).To(BeNumerically(">", elapseNormalRedirect, 10*time.Millisecond))
})
})
})

0 comments on commit d962bdb

Please sign in to comment.