cluster.go

@@ -92,8 +92,8 @@ type connrole struct {
 	replica bool
 }
 
-func newClusterClient(opt *ClientOption, connFn connFn) (client *clusterClient, err error) {
-	client = &clusterClient{
+func newClusterClient(opt *ClientOption, connFn connFn) (*clusterClient, error) {
+	client := &clusterClient{
 		cmd:    cmds.NewBuilder(cmds.InitSlot),
 		connFn: connFn,
 		opt:    opt,
@@ -120,11 +120,11 @@ func newClusterClient(opt *ClientOption, connFn connFn) (client *clusterClient,
 		return cc
 	}
 
-	if err = client.init(); err != nil {
+	if err := client.init(); err != nil {
 		return nil, err
 	}
 
-	if err = client.refresh(context.Background()); err != nil {
+	if err := client.refresh(context.Background()); err != nil {
 		return client, err
 	}
 

cluster_test.go

@@ -4330,3 +4330,23 @@ func TestClusterShardsParsing(t *testing.T) {
 		}
 	})
 }
+
+// https://github.com/redis/rueidis/issues/543
+func TestConnectToNonAvailableCluster(t *testing.T) {
+	var wg sync.WaitGroup
+	for i := 0; i < 4; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for i := 0; i < 100; i++ {
+				_, err := NewClient(ClientOption{
+					InitAddress: []string{"127.0.0.1:3000", "127.0.0.1:3001", "127.0.0.1:3002"},
+				})
+				if err == nil {
+					t.Errorf("expected connect error")
+				}
+			}
+		}()
+	}
+	wg.Wait()
+}

dockertest.sh

@@ -2,6 +2,19 @@
 
 set -ev
 
+go vet ./...
+
+go install honnef.co/go/tools/cmd/staticcheck@latest
+# disabled checks
+#  -ST1000 missing package doc in internal packages
+#  -ST1003 wrong naming convention would require breaking changes
+#  -ST1012 wrong error name convention in om package would require breaking changes
+#  -ST1016 violation of methods on the same type should have the same receiver name in rueidishook
+#  -ST1020 violation of go doc comment on exported methods in rueidiscompat
+#  -ST1021 violation of go doc comment on exported types in rueidiscompat
+#  -U1000 unused check in mock package
+staticcheck -checks "all,-ST1000,-ST1003,-ST1012,-ST1016,-ST1020,-ST1021,-U1000"  ./... | (grep -v "_test.go:" && exit 1 || exit 0)
+
 trap "docker-compose down -v" EXIT
 docker-compose up -d
 sleep 5

mock/go.mod

@@ -5,7 +5,7 @@ go 1.20
 replace github.com/redis/rueidis => ../
 
 require (
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 	go.uber.org/mock v0.3.0
 )
 

om/go.mod

@@ -6,7 +6,7 @@ replace github.com/redis/rueidis => ../
 
 require (
 	github.com/oklog/ulid/v2 v2.1.0
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 )
 
 require golang.org/x/sys v0.19.0 // indirect

pipe.go

@@ -21,7 +21,7 @@ import (
 )
 
 const LibName = "rueidis"
-const LibVer = "1.0.36"
+const LibVer = "1.0.37"
 
 var noHello = regexp.MustCompile("unknown command .?(HELLO|hello).?")
 

rueidisaside/go.mod

@@ -6,7 +6,7 @@ replace github.com/redis/rueidis => ../
 
 require (
 	github.com/oklog/ulid/v2 v2.1.0
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 )
 
 require golang.org/x/sys v0.19.0 // indirect

rueidiscompat/adapter.go

@@ -707,8 +707,7 @@ func (c *Compat) Keys(ctx context.Context, pattern string) *StringSliceCmd {
 }
 
 func (c *Compat) Migrate(ctx context.Context, host string, port int64, key string, db int64, timeout time.Duration) *StatusCmd {
-	var cmd rueidis.Completed
-	cmd = c.client.B().Migrate().Host(host).Port(port).Key(key).DestinationDb(db).Timeout(formatSec(timeout)).Build()
+	cmd := c.client.B().Migrate().Host(host).Port(port).Key(key).DestinationDb(db).Timeout(formatSec(timeout)).Build()
 	resp := c.client.Do(ctx, cmd)
 	return newStatusCmd(resp)
 }

rueidiscompat/go.mod

@@ -7,7 +7,7 @@ replace github.com/redis/rueidis => ../
 require (
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 )
 
 require (

rueidishook/go.mod

@@ -8,8 +8,8 @@ replace (
 )
 
 require (
-	github.com/redis/rueidis v1.0.36
-	github.com/redis/rueidis/mock v1.0.36
+	github.com/redis/rueidis v1.0.37
+	github.com/redis/rueidis/mock v1.0.37
 	go.uber.org/mock v0.4.0
 )
 

rueidisotel/go.mod

@@ -5,7 +5,7 @@ go 1.20
 replace github.com/redis/rueidis => ../
 
 require (
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/metric v1.24.0
 	go.opentelemetry.io/otel/sdk v1.24.0

rueidisprob/go.mod

@@ -5,7 +5,7 @@ go 1.20.0
 replace github.com/redis/rueidis => ../
 
 require (
-	github.com/redis/rueidis v1.0.36
+	github.com/redis/rueidis v1.0.37
 	github.com/twmb/murmur3 v1.1.8
 )