调整部分场景的兼容处理 (#11)

polaris-contrib · Aug 1, 2023 · dce2b97 · dce2b97
1 parent fa965e1
commit dce2b97
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/core/storage.go b/core/storage.go
@@ -287,7 +287,7 @@ func NoopSelectInstances(ctx *FilterContext, result *nacosmodel.ServiceInfo,
 func SelectInstancesWithHealthyProtection(ctx *FilterContext, result *nacosmodel.ServiceInfo,
 	instances []*nacosmodel.Instance, healthCount int32) *nacosmodel.ServiceInfo {
 	protectThreshold := ctx.Service.ProtectionThreshold
-	if len(instances) > 0 && float64(healthCount)/float64(len(instances)) <= protectThreshold {
+	if len(instances) > 0 && float64(healthCount)/float64(len(instances)) >= protectThreshold {
 		ret := instances
 		if ctx.HealthyOnly {
 			healthyIns := make([]*nacosmodel.Instance, 0, len(instances))

diff --git a/model/instance.go b/model/instance.go
@@ -27,16 +27,16 @@ import (
 )
 
 type Service struct {
-	CacheMillis              uint64     `json:"cacheMillis"`
-	Hosts                    []Instance `json:"hosts"`
-	Checksum                 string     `json:"checksum"`
-	LastRefTime              uint64     `json:"lastRefTime"`
-	Clusters                 string     `json:"clusters"`
-	Name                     string     `json:"name"`
-	GroupName                string     `json:"groupName"`
-	Valid                    bool       `json:"valid"`
-	AllIPs                   bool       `json:"allIPs"`
-	ReachProtectionThreshold bool       `json:"reachProtectionThreshold"`
+	CacheMillis              int64       `json:"cacheMillis"`
+	Hosts                    []*Instance `json:"hosts"`
+	Checksum                 string      `json:"checksum"`
+	LastRefTime              int64       `json:"lastRefTime"`
+	Clusters                 string      `json:"clusters"`
+	Name                     string      `json:"name"`
+	GroupName                string      `json:"groupName"`
+	Valid                    bool        `json:"valid"`
+	AllIPs                   bool        `json:"allIPs"`
+	ReachProtectionThreshold bool        `json:"reachProtectionThreshold"`
 }
 
 type SimpleServiceInfo struct {

diff --git a/v1/access.go b/v1/access.go
@@ -192,7 +192,7 @@ func (n *NacosV1Server) ListInstances(req *restful.Request, rsp *restful.Respons
 	params := ParseQueryParams(req)
 
 	params[model.ParamNamespaceID] = model.ToPolarisNamespace(params[model.ParamNamespaceID])
-	data, err := n.handleQueryInstances(ctx, ParseQueryParams(req))
+	data, err := n.handleQueryInstances(ctx, params)
 	if err != nil {
 		core.WrirteNacosErrorResponse(err, rsp)
 		return

diff --git a/v2/service.go b/v2/service.go
@@ -19,7 +19,9 @@ package v2
 
 import (
 	"context"
+	"strings"
 
+	"github.com/polaris-contrib/apiserver-nacos/core"
 	"github.com/polaris-contrib/apiserver-nacos/model"
 	nacospb "github.com/polaris-contrib/apiserver-nacos/v2/pb"
 )
@@ -36,25 +38,25 @@ func (h *NacosV2Server) handleServiceQueryRequest(ctx context.Context, req nacos
 			Success:    true,
 			Message:    "success",
 		},
-		ServiceInfo: model.Service{
-			Name:      svcQueryReq.ServiceName,
-			GroupName: svcQueryReq.GroupName,
-			Hosts:     make([]model.Instance, 0),
-		},
 	}
 	namespace := model.ToPolarisNamespace(svcQueryReq.Namespace)
-	svc := h.discoverSvr.Cache().Service().GetServiceByName(svcQueryReq.ServiceName, namespace)
-	if svc == nil {
-		return resp, nil
-	}
-	insts := h.discoverSvr.Cache().Instance().GetInstancesByServiceID(svc.ID)
-	if insts == nil {
-		return resp, nil
+	filterCtx := &core.FilterContext{
+		Service:     core.ToNacosService(h.discoverSvr.Cache(), namespace, svcQueryReq.ServiceName, svcQueryReq.GroupName),
+		Clusters:    strings.Split(svcQueryReq.Cluster, ","),
+		EnableOnly:  true,
+		HealthyOnly: svcQueryReq.HealthyOnly,
 	}
-	for _, inst := range insts {
-		ins := model.Instance{}
-		ins.FromSpecInstance(inst)
-		resp.ServiceInfo.Hosts = append(resp.ServiceInfo.Hosts, ins)
+	// 默认只下发 enable 的实例
+	result := h.store.ListInstances(filterCtx, core.SelectInstancesWithHealthyProtection)
+	resp.ServiceInfo = model.Service{
+		Name:                     svcQueryReq.ServiceName,
+		GroupName:                svcQueryReq.GroupName,
+		Clusters:                 result.Clusters,
+		CacheMillis:              result.CacheMillis,
+		Hosts:                    result.Hosts,
+		Checksum:                 result.Checksum,
+		LastRefTime:              result.LastRefTime,
+		ReachProtectionThreshold: result.ReachProtectionThreshold,
 	}
 	return resp, nil
 }