[
https://issues.apache.org/jira/browse/SCB-298?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16343111#comment-16343111
]
ASF GitHub Bot commented on SCB-298:
------------------------------------
asifdxtreme closed pull request #264: SCB-298 v4/default/govern/microservices
return self microservice information
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/264
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/govern/service.go b/server/govern/service.go
index 15e36d11..73780e54 100644
--- a/server/govern/service.go
+++ b/server/govern/service.go
@@ -84,9 +84,6 @@ func (governService *GovernService) GetServicesInfo(ctx
context.Context, in *pb.
allServiceDetails := make([]*pb.ServiceDetail, 0, len(services))
domainProject := util.ParseDomainProject(ctx)
for _, service := range services {
- if apt.Service.ServiceId == service.ServiceId {
- continue
- }
if len(in.AppId) > 0 {
if in.AppId != service.AppId {
continue
@@ -214,9 +211,6 @@ func (governService *GovernService) GetApplications(ctx
context.Context, in *pb.
if _, ok := appMap[key.AppId]; ok {
continue
}
- if apt.IsSCKey(key) {
- continue
- }
appMap[key.AppId] = struct{}{}
apps = append(apps, key.AppId)
}
@@ -379,32 +373,20 @@ func statistics(ctx context.Context) (*pb.Statistics,
error) {
}
app := make(map[string]interface{}, respSvc.Count)
- scSvc := make(map[string]interface{}, respSvc.Count)
svcWithNonVersion := make(map[string]interface{}, respSvc.Count)
for _, kv := range respSvc.Kvs {
key, _ := pb.GetInfoFromSvcIndexKV(kv)
- if _, ok := app[key.AppId]; !ok {
- if !apt.IsSCKey(key) {
- app[key.AppId] = nil
- }
- }
- if apt.IsSCKey(key) {
- k := util.BytesToStringWithNoCopy(kv.Key)
- if _, ok := scSvc[k]; !ok {
- scSvc[k] = nil
- }
+ if _, ok := app[key.AppId]; !ok {
+ app[key.AppId] = nil
}
key.Version = ""
svcWithNonVersionKey := apt.GenerateServiceIndexKey(key)
svcWithNonVersion[svcWithNonVersionKey] = nil
}
- scSvcCount := 0
- if int64(len(scSvc)) > 0 {
- scSvcCount = 1
- }
- result.Services.Count = int64(len(svcWithNonVersion) - scSvcCount)
+
+ result.Services.Count = int64(len(svcWithNonVersion))
result.Apps.Count = int64(len(app))
// instance
@@ -425,27 +407,7 @@ func statistics(ctx context.Context) (*pb.Statistics,
error) {
onlineServices[serviceId] = nil
}
}
-
- key = apt.GenerateInstanceKey(domainProject, apt.Service.ServiceId, "")
- scOpts := append(opts,
- registry.WithStrKey(key),
- registry.WithPrefix(),
- registry.WithCountOnly())
- respScIns, err := store.Store().Instance().Search(ctx, scOpts...)
- if err != nil {
- return nil, err
- }
-
- result.Instances.Count = respIns.Count - respScIns.Count
- result.Services.OnlineCount = removeSCSelf(domainProject,
int64(len(onlineServices)), 1)
+ result.Instances.Count = respIns.Count
+ result.Services.OnlineCount = int64(len(onlineServices))
return result, err
}
-
-func removeSCSelf(domainProject string, count int64, removeNum int64) int64 {
- if count > 0 {
- if apt.IsDefaultDomainProject(domainProject) {
- count = count - removeNum
- }
- }
- return count
-}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> v4/default/govern/microservices?options=instances,dependencies doesn't return
> self microservice information
> -----------------------------------------------------------------------------------------------------------
>
> Key: SCB-298
> URL: https://issues.apache.org/jira/browse/SCB-298
> Project: Apache ServiceComb
> Issue Type: Bug
> Components: Service-Center
> Reporter: Mohammad Asif Siddiqui
> Assignee: little-cui
> Priority: Major
> Fix For: service-center-1.0.0-m2
>
>
> v4/default/govern/microservices?options=instances,dependencies this api is
> not returning self microservice information because of which there is a
> discrepancy in the number of microservivces showing in dashboard and in the
> service list.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
