tianxiaoliang commented on a change in pull request #782:
URL:
https://github.com/apache/servicecomb-service-center/pull/782#discussion_r540660810
##########
File path: datasource/mongo/ms.go
##########
@@ -1547,40 +1559,36 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *pb.GetInstances
request.ConsumerServiceId, service.ServiceInfo.Environment,
service.ServiceInfo.AppId, service.ServiceInfo.ServiceName,
service.ServiceInfo.Version,
provider.ServiceInfo.ServiceId,
provider.ServiceInfo.Environment, provider.ServiceInfo.AppId,
provider.ServiceInfo.ServiceName, provider.ServiceInfo.Version)
- domain := util.ParseDomain(ctx)
- project := util.ParseProject(ctx)
- filter = bson.M{
- ColumnDomain: domain,
- ColumnProject: project,
- StringBuilder([]string{ColumnInstanceInfo, ColumnServiceID}):
request.ProviderServiceId}
- resp, err := client.GetMongoClient().Find(ctx, CollectionInstance,
filter)
+ services, err := findServices(ctx, pb.MicroServiceToKey(domainProject,
provider.ServiceInfo))
if err != nil {
- log.Error(fmt.Sprintf("FindInstancesCache.Get failed %s
failed", findFlag), err)
+ log.Error(fmt.Sprintf("FindInstances.Get failed %s failed",
findFlag), err)
Review comment:
小写，一样的问题
##########
File path: datasource/mongo/ms.go
##########
@@ -1547,40 +1559,36 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *pb.GetInstances
request.ConsumerServiceId, service.ServiceInfo.Environment,
service.ServiceInfo.AppId, service.ServiceInfo.ServiceName,
service.ServiceInfo.Version,
provider.ServiceInfo.ServiceId,
provider.ServiceInfo.Environment, provider.ServiceInfo.AppId,
provider.ServiceInfo.ServiceName, provider.ServiceInfo.Version)
- domain := util.ParseDomain(ctx)
- project := util.ParseProject(ctx)
- filter = bson.M{
- ColumnDomain: domain,
- ColumnProject: project,
- StringBuilder([]string{ColumnInstanceInfo, ColumnServiceID}):
request.ProviderServiceId}
- resp, err := client.GetMongoClient().Find(ctx, CollectionInstance,
filter)
+ services, err := findServices(ctx, pb.MicroServiceToKey(domainProject,
provider.ServiceInfo))
if err != nil {
- log.Error(fmt.Sprintf("FindInstancesCache.Get failed %s
failed", findFlag), err)
+ log.Error(fmt.Sprintf("FindInstances.Get failed %s failed",
findFlag), err)
return &pb.GetInstancesResponse{
Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
}, err
}
- if resp == nil {
+ if services == nil {
mes := fmt.Errorf("%s failed, provider does not exist",
findFlag)
- log.Error("FindInstancesCache.Get failed", mes)
+ log.Error("FindInstances.Get failed", mes)
return &pb.GetInstancesResponse{
Response: pb.CreateResponse(pb.ErrServiceNotExists,
mes.Error()),
}, nil
}
-
- var instances []*pb.MicroServiceInstance
- for resp.Next(ctx) {
- var instance Instance
- err := resp.Decode(&instance)
- if err != nil {
- log.Error(fmt.Sprintf("FindInstances.GetWithProviderID
failed %s failed", findFlag), err)
- return &pb.GetInstancesResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- instances = append(instances, instance.InstanceInfo)
+ serviceIDs := filterServiceIDs(ctx, request.ConsumerServiceId,
request.Tags, services)
+ if len(serviceIDs) == 0 {
+ mes := fmt.Errorf("%s failed, provider instance does not
exist", findFlag)
Review comment:
类似问题检查，抽常量
##########
File path: datasource/mongo/ms.go
##########
@@ -2250,3 +2298,364 @@ func preProcessRegisterInstance(ctx context.Context,
instance *pb.MicroServiceIn
instance.Version = microservice.ServiceInfo.Version
return nil
}
+
+func findServices(ctx context.Context, key *pb.MicroServiceKey) ([]*Service,
error) {
+ tenant := strings.Split(key.Tenant, "/")
+ rangeIdx := strings.Index(key.Version, "-")
+ switch {
+ case key.Version == "latest":
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ }
+ return filterLatestServices(ctx, filter)
+ case key.Version[len(key.Version)-1:] == "+":
+ start := key.Version[:len(key.Version)-1]
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): bson.M{"$gte": start}}
+ return filterServices(ctx, filter)
+ case rangeIdx > 0:
+ start := key.Version[:rangeIdx]
+ end := key.Version[rangeIdx+1:]
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): bson.M{"$gte": start, "$lte": end}}
+ return filterServices(ctx, filter)
+ default:
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): key.Version}
+ return filterServices(ctx, filter)
+ }
+}
+
+func findInstancesByServiceIDs(ctx context.Context, serviceIDs []string)
([]*pb.MicroServiceInstance, error) {
Review comment:
这是JPA风格代码，不提倡，改下
##########
File path: datasource/mongo/ms.go
##########
@@ -2250,3 +2298,364 @@ func preProcessRegisterInstance(ctx context.Context,
instance *pb.MicroServiceIn
instance.Version = microservice.ServiceInfo.Version
return nil
}
+
+func findServices(ctx context.Context, key *pb.MicroServiceKey) ([]*Service,
error) {
+ tenant := strings.Split(key.Tenant, "/")
+ rangeIdx := strings.Index(key.Version, "-")
+ switch {
+ case key.Version == "latest":
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ }
+ return filterLatestServices(ctx, filter)
+ case key.Version[len(key.Version)-1:] == "+":
+ start := key.Version[:len(key.Version)-1]
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): bson.M{"$gte": start}}
+ return filterServices(ctx, filter)
+ case rangeIdx > 0:
+ start := key.Version[:rangeIdx]
+ end := key.Version[rangeIdx+1:]
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): bson.M{"$gte": start, "$lte": end}}
+ return filterServices(ctx, filter)
+ default:
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnVersion}): key.Version}
+ return filterServices(ctx, filter)
+ }
+}
+
+func findInstancesByServiceIDs(ctx context.Context, serviceIDs []string)
([]*pb.MicroServiceInstance, error) {
+ resp, err := client.GetMongoClient().Find(ctx, CollectionInstance,
bson.M{StringBuilder([]string{ColumnInstanceInfo, ColumnServiceID}):
bson.M{"$in": serviceIDs}}, &options.FindOptions{
+ Sort: bson.M{StringBuilder([]string{ColumnInstanceInfo,
ColumnVersion}): -1}})
+ if err != nil {
+ return nil, err
+ }
+ if resp == nil {
+ return nil, nil
+ }
+
+ var instances []*pb.MicroServiceInstance
+ for resp.Next(ctx) {
+ var instance Instance
+ err := resp.Decode(&instance)
+ if err != nil {
+ return nil, err
+ }
+ instances = append(instances, instance.InstanceInfo)
+ }
+ return instances, nil
+}
+
+func filterServiceIDs(ctx context.Context, consumerID string, tags []string,
services []*Service) []string {
+ var filterService []*Service
+ var serviceIDs []string
+ filterService = tagsFilter(services, tags)
+ filterService = accessibleFilter(ctx, consumerID, filterService)
+ for _, service := range filterService {
+ serviceIDs = append(serviceIDs, service.ServiceInfo.ServiceId)
+ }
+ return serviceIDs
+}
+
+func tagsFilter(services []*Service, tags []string) []*Service {
+ var newServices []*Service
+loop:
Review comment:
不允许使用goto
##########
File path: datasource/mongo/ms.go
##########
@@ -2250,3 +2298,364 @@ func preProcessRegisterInstance(ctx context.Context,
instance *pb.MicroServiceIn
instance.Version = microservice.ServiceInfo.Version
return nil
}
+
+func findServices(ctx context.Context, key *pb.MicroServiceKey) ([]*Service,
error) {
+ tenant := strings.Split(key.Tenant, "/")
+ rangeIdx := strings.Index(key.Version, "-")
+ switch {
+ case key.Version == "latest":
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
Review comment:
没判断长度 不可以调用
##########
File path: datasource/mongo/ms.go
##########
@@ -1547,40 +1559,36 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *pb.GetInstances
request.ConsumerServiceId, service.ServiceInfo.Environment,
service.ServiceInfo.AppId, service.ServiceInfo.ServiceName,
service.ServiceInfo.Version,
provider.ServiceInfo.ServiceId,
provider.ServiceInfo.Environment, provider.ServiceInfo.AppId,
provider.ServiceInfo.ServiceName, provider.ServiceInfo.Version)
- domain := util.ParseDomain(ctx)
- project := util.ParseProject(ctx)
- filter = bson.M{
- ColumnDomain: domain,
- ColumnProject: project,
- StringBuilder([]string{ColumnInstanceInfo, ColumnServiceID}):
request.ProviderServiceId}
- resp, err := client.GetMongoClient().Find(ctx, CollectionInstance,
filter)
+ services, err := findServices(ctx, pb.MicroServiceToKey(domainProject,
provider.ServiceInfo))
if err != nil {
- log.Error(fmt.Sprintf("FindInstancesCache.Get failed %s
failed", findFlag), err)
+ log.Error(fmt.Sprintf("FindInstances.Get failed %s failed",
findFlag), err)
return &pb.GetInstancesResponse{
Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
}, err
}
- if resp == nil {
+ if services == nil {
mes := fmt.Errorf("%s failed, provider does not exist",
findFlag)
- log.Error("FindInstancesCache.Get failed", mes)
+ log.Error("FindInstances.Get failed", mes)
Review comment:
类似问题检查下
##########
File path: datasource/mongo/ms.go
##########
@@ -2250,3 +2298,364 @@ func preProcessRegisterInstance(ctx context.Context,
instance *pb.MicroServiceIn
instance.Version = microservice.ServiceInfo.Version
return nil
}
+
+func findServices(ctx context.Context, key *pb.MicroServiceKey) ([]*Service,
error) {
+ tenant := strings.Split(key.Tenant, "/")
+ rangeIdx := strings.Index(key.Version, "-")
+ switch {
+ case key.Version == "latest":
+ filter := bson.M{
+ ColumnDomain: tenant[0],
+ ColumnProject: tenant[1],
+ StringBuilder([]string{ColumnServiceInfo, ColumnEnv}):
key.Environment,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnAppID}): key.AppId,
+ StringBuilder([]string{ColumnServiceInfo,
ColumnServiceName}): key.ServiceName,
+ }
+ return filterLatestServices(ctx, filter)
+ case key.Version[len(key.Version)-1:] == "+":
Review comment:
可能越界
##########
File path: datasource/mongo/ms.go
##########
@@ -1910,14 +1922,53 @@ func registryInstance(ctx context.Context, request
*pb.RegisterInstanceRequest)
}, err
}
- log.Infof("register instance %s, instanceID %s, operator %s",
- instanceFlag, insertRes.InsertedID, remoteIP)
+ log.Info(fmt.Sprintf("register instance %s, instanceID %s, operator %s",
+ instanceFlag, insertRes.InsertedID, remoteIP))
return &pb.RegisterInstanceResponse{
Response: pb.CreateResponse(pb.ResponseSuccess, "Register
service instance successfully."),
InstanceId: instanceID,
}, nil
}
+func (ds *DataSource) findSharedServiceInstance(ctx context.Context, request
*pb.FindInstancesRequest, provider *pb.MicroServiceKey)
(*pb.FindInstancesResponse, error) {
+ var err error
+ // it means the shared micro-services must be the same env with SC.
+ provider.Environment = core.Service.Environment
+ findFlag := fmt.Sprintf("find shared provider[%s/%s/%s/%s]",
provider.Environment, provider.AppId, provider.ServiceName, provider.Version)
+ services, err := findServices(ctx, provider)
+ if err != nil {
+ log.Error(fmt.Sprintf("FindInstances.Get failed %s failed",
findFlag), err)
Review comment:
类似问题，不要用代码语言搞日志信息
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
