This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 13d57de SCB-2176 Fix: remove all instances properties (#908)
13d57de is described below
commit 13d57de2f72771c7f50b4e41983306332f22e50b
Author: little-cui <[email protected]>
AuthorDate: Mon Mar 22 16:01:57 2021 +0800
SCB-2176 Fix: remove all instances properties (#908)
---
server/rest/govern/service.go | 2 +-
server/service/instance.go | 2 +-
server/service/util/instance_util.go | 6 ++++--
server/service/util/instance_util_test.go | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/server/rest/govern/service.go b/server/rest/govern/service.go
index d2d6a98..c5cc9c1 100644
--- a/server/rest/govern/service.go
+++ b/server/rest/govern/service.go
@@ -317,7 +317,7 @@ func getServiceDetailUtil(ctx context.Context,
serviceDetailOpt ServiceDetailOpt
Count: instanceCount}
continue
}
- instances, err :=
serviceUtil.GetAllInstancesOfOneService(ctx, domainProject, serviceID)
+ instances, err :=
serviceUtil.GetInstancesWithoutProperties(ctx, domainProject, serviceID)
if err != nil {
log.Errorf(err, "get service[%s]'s all
instances failed", serviceID)
return nil, err
diff --git a/server/service/instance.go b/server/service/instance.go
index aafa7b4..989cfea 100644
--- a/server/service/instance.go
+++ b/server/service/instance.go
@@ -961,7 +961,7 @@ func (s *InstanceService) ClusterHealth(ctx
context.Context) (*pb.GetInstancesRe
}, nil
}
- instances, err := serviceUtil.GetAllInstancesOfOneService(ctx,
domainProject, serviceID)
+ instances, err := serviceUtil.GetInstancesWithoutProperties(ctx,
domainProject, serviceID)
if err != nil {
log.Errorf(err, "health check failed: get service
center[%s][%s/%s/%s/%s]'s instances failed",
serviceID, apt.Service.Environment, apt.Service.AppId,
apt.Service.ServiceName, apt.Service.Version)
diff --git a/server/service/util/instance_util.go
b/server/service/util/instance_util.go
index 2d77dd4..222acde 100644
--- a/server/service/util/instance_util.go
+++ b/server/service/util/instance_util.go
@@ -72,7 +72,7 @@ func FormatRevision(revs, counts []int64) (s string) {
return fmt.Sprintf("%x", sha1.Sum(util.StringToBytesWithNoCopy(s)))
}
-func GetAllInstancesOfOneService(ctx context.Context, domainProject string,
serviceID string) ([]*pb.MicroServiceInstance, error) {
+func GetInstancesWithoutProperties(ctx context.Context, domainProject string,
serviceID string) ([]*pb.MicroServiceInstance, error) {
key := apt.GenerateInstanceKey(domainProject, serviceID, "")
opts := append(FromContext(ctx), registry.WithStrKey(key),
registry.WithPrefix())
resp, err := backend.Store().Instance().Search(ctx, opts...)
@@ -83,7 +83,9 @@ func GetAllInstancesOfOneService(ctx context.Context,
domainProject string, serv
instances := make([]*pb.MicroServiceInstance, 0, len(resp.Kvs))
for _, kv := range resp.Kvs {
- instances = append(instances,
kv.Value.(*pb.MicroServiceInstance))
+ instance := kv.Value.(*pb.MicroServiceInstance)
+ instance.Properties = nil
+ instances = append(instances, instance)
}
return instances, nil
}
diff --git a/server/service/util/instance_util_test.go
b/server/service/util/instance_util_test.go
index ca075c5..04494f8 100644
--- a/server/service/util/instance_util_test.go
+++ b/server/service/util/instance_util_test.go
@@ -53,9 +53,9 @@ func TestGetInstance(t *testing.T) {
t.Fatalf(`GetInstance failed`)
}
- _, err = GetAllInstancesOfOneService(context.Background(), "", "")
+ _, err = GetInstancesWithoutProperties(context.Background(), "", "")
if err != nil {
- t.Fatalf(`GetAllInstancesOfOneService failed`)
+ t.Fatalf(`GetInstancesWithoutProperties failed`)
}
QueryAllProvidersInstances(context.Background(), "")
