Fixing bugs for HAConnFactory

Author: nvorobev

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.1.1 (2023-06-24)
+
+- Fixed connection selection error for HAConnFactory in MGet/MGetWithGD
+- Fixed a bug with the handling of the weight value for the slave
+
 ## v3.1.0 (2023-06-13)
 
 - Edit optional Hooks to HAConfig

ha_conn_factory.go

@@ -2,6 +2,7 @@ package pool
 
 import (
 	"errors"
+	"fmt"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -126,13 +127,14 @@ func (cfg *HAConfig) init() error {
 	}
 	cfg.weights = make([]int64, len(cfg.Slaves))
 	for i, slave := range cfg.Slaves {
-		elems := strings.Split(slave, ":")
 		cfg.weights[i] = 100
+		elems := strings.Split(slave, ":")
 		if len(elems) == 3 {
 			cfg.weights[i], err = strconv.ParseInt(elems[2], 10, 64)
 			if err != nil {
 				return errors.New("the weight should be integer")
 			}
+			cfg.Slaves[i] = fmt.Sprintf("%s:%s", elems[0], elems[1])
 		}
 	}
 	if cfg.ServerRetryTimeout <= 0 {

pool.go

@@ -353,7 +353,7 @@ func (p *Pool) MGetWithGD(ctx context.Context, keys ...string) ([]interface{}, m
 	keyErrors := make(map[string]error, 0)
 
 	if _, ok := p.connFactory.(*HAConnFactory); ok {
-		conn, _ := p.connFactory.getMasterConn()
+		conn, _ := p.connFactory.getSlaveConn()
 		vals, err := conn.MGet(ctx, keys...).Result()
 		if err != nil {
 			for _, key := range keys {

pool_test.go

@@ -23,15 +23,17 @@ var _ = Describe("Pool", func() {
 		haConfig := &HAConfig{
 			Master: "127.0.0.1:8379",
 			Slaves: []string{
-				"127.0.0.1:8380",
-				"127.0.0.1:8381",
+				"127.0.0.1:8380:100",
+				"127.0.0.1:8381:200",
 			},
+			PollType: PollByWeight,
 		}
 		haConfig1 := &HAConfig{
 			Master: "127.0.0.1:8382",
 			Slaves: []string{
 				"127.0.0.1:8383",
 			},
+			PollType: PollByWeight,
 		}
 
 		haPool, err = NewHA(haConfig)
@@ -1824,7 +1826,6 @@ var _ = Describe("Pool_GD", func() {
 			for _, pool := range pools {
 				_, err := pool.Ping(ctx).Result()
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(Equal("dial tcp 127.0.0.1:8384: connect: connection refused"))
 			}
 		})