fix nacos weight <= 0 bug

cloudwego-contrib · Sep 19, 2024 · 11f1826 · 11f1826
1 parent 23c28df
commit 11f1826
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/registry/nacos/nacoshertz/registry.go b/registry/nacos/nacoshertz/registry.go
@@ -51,13 +51,18 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 	if host == "" || host == "::" {
 		host = utils.LocalIP()
 	}
+	// make sure nacos weight >= 0
+	weight := 1
+	if info.Weight >= 0 {
+		weight = info.Weight
+	}
 	success, err := n.client.RegisterInstance(vo.RegisterInstanceParam{
 		Ip:          host,
 		Port:        uint64(p),
 		ServiceName: info.ServiceName,
 		GroupName:   n.opts.Group,
 		ClusterName: n.opts.Cluster,
-		Weight:      float64(info.Weight),
+		Weight:      float64(weight),
 		Enable:      true,
 		Healthy:     true,
 		Ephemeral:   true,

diff --git a/registry/nacos/nacoshertz/v2/registry.go b/registry/nacos/nacoshertz/v2/registry.go
@@ -73,13 +73,18 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 	if host == "" || host == "::" {
 		host = utils.LocalIP()
 	}
+	// make sure nacos weight >= 0
+	weight := 1
+	if info.Weight >= 0 {
+		weight = info.Weight
+	}
 	success, err := n.client.RegisterInstance(vo.RegisterInstanceParam{
 		Ip:          host,
 		Port:        uint64(p),
 		ServiceName: info.ServiceName,
 		GroupName:   n.opts.Group,
 		ClusterName: n.opts.Cluster,
-		Weight:      float64(info.Weight),
+		Weight:      float64(weight),
 		Enable:      true,
 		Ephemeral:   true,
 		Healthy:     true,

diff --git a/registry/nacos/nacoskitex/registry/registry.go b/registry/nacos/nacoskitex/registry/registry.go
@@ -74,12 +74,16 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 			return fmt.Errorf("parse registry info addr cwerror: %w", err)
 		}
 	}
-
+	// make sure nacos weight >= 0
+	weight := 1
+	if info.Weight >= 0 {
+		weight = info.Weight
+	}
 	_, e := n.cli.RegisterInstance(vo.RegisterInstanceParam{
 		Ip:          host,
 		Port:        uint64(p),
 		ServiceName: info.ServiceName,
-		Weight:      float64(info.Weight),
+		Weight:      float64(weight),
 		Enable:      true,
 		Healthy:     true,
 		Metadata:    mergeTags(info.Tags, nacos.Tags),

diff --git a/registry/nacos/nacoskitex/v2/registry/registry.go b/registry/nacos/nacoskitex/v2/registry/registry.go
@@ -92,12 +92,16 @@ func (n *nacosRegistry) Register(info *registry.Info) error {
 			return fmt.Errorf("parse registry info addr cwerror: %w", err)
 		}
 	}
-
+	// make sure nacos weight >= 0
+	weight := 1
+	if info.Weight >= 0 {
+		weight = info.Weight
+	}
 	_, e := n.cli.RegisterInstance(vo.RegisterInstanceParam{
 		Ip:          host,
 		Port:        uint64(p),
 		ServiceName: info.ServiceName,
-		Weight:      float64(info.Weight),
+		Weight:      float64(weight),
 		Enable:      true,
 		Healthy:     true,
 		Metadata:    mergeTags(info.Tags, nacos.Tags),