You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/10/16 10:40:44 UTC
[GitHub] wu-sheng closed pull request #1775: Fixed the bug of service
topology and global topology.
wu-sheng closed pull request #1775: Fixed the bug of service topology and global topology.
URL: https://github.com/apache/incubator-skywalking/pull/1775
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/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
index 5cdcdab3d..b10f9b3d1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
@@ -51,11 +51,14 @@ Topology build(List<ServiceComponent> serviceComponents, List<ServiceMapping> se
Map<Integer, Integer> mappings = changeMapping2Map(serviceMappings);
filterZeroSourceOrTargetReference(serviceRelationClientCalls);
filterZeroSourceOrTargetReference(serviceRelationServerCalls);
- serviceRelationServerCalls = serverCallsFilter(serviceRelationServerCalls);
+ mappingIdExchange(mappings, serviceRelationClientCalls);
+ mappingIdExchange(mappings, serviceRelationServerCalls);
List<Node> nodes = new LinkedList<>();
List<Call> calls = new LinkedList<>();
Set<Integer> nodeIds = new HashSet<>();
+ Set<String> callIds = new HashSet<>();
+
serviceRelationClientCalls.forEach(clientCall -> {
ServiceInventory source = serviceInventoryCache.get(clientCall.getSource());
ServiceInventory target = serviceInventoryCache.get(clientCall.getTarget());
@@ -72,29 +75,28 @@ Topology build(List<ServiceComponent> serviceComponents, List<ServiceMapping> se
}
}
- Set<Integer> serviceNodeIds = buildNodeIds(nodes);
- if (!serviceNodeIds.contains(source.getSequence())) {
- Node serviceNode = new Node();
- serviceNode.setId(source.getSequence());
- serviceNode.setName(source.getName());
- serviceNode.setType(nodeCompMap.getOrDefault(source.getSequence(), Const.UNKNOWN));
- if (BooleanUtils.valueToBoolean(source.getIsAddress())) {
- serviceNode.setReal(false);
- } else {
- serviceNode.setReal(true);
- }
- nodes.add(serviceNode);
+ if (!nodeIds.contains(source.getSequence())) {
+ nodes.add(buildNode(nodeCompMap, source));
+ nodeIds.add(source.getSequence());
}
- Call call = new Call();
- call.setSource(source.getSequence());
+ if (!nodeIds.contains(target.getSequence())) {
+ nodes.add(buildNode(nodeCompMap, target));
+ nodeIds.add(target.getSequence());
+ }
- int actualTargetId = mappings.getOrDefault(target.getSequence(), target.getSequence());
- call.setTarget(actualTargetId);
- call.setCallType(nodeCompMap.get(clientCall.getTarget()));
- call.setId(clientCall.getId());
- call.setDetectPoint(DetectPoint.CLIENT);
- calls.add(call);
+ String callId = source.getSequence() + Const.ID_SPLIT + target.getSequence();
+ if (!callIds.contains(callId)) {
+ callIds.add(callId);
+
+ Call call = new Call();
+ call.setSource(source.getSequence());
+ call.setTarget(target.getSequence());
+ call.setCallType(nodeCompMap.get(clientCall.getTarget()));
+ call.setId(clientCall.getId());
+ call.setDetectPoint(DetectPoint.CLIENT);
+ calls.add(call);
+ }
});
serviceRelationServerCalls.forEach(serverCall -> {
@@ -125,18 +127,33 @@ Topology build(List<ServiceComponent> serviceComponents, List<ServiceMapping> se
}
}
- Call call = new Call();
- call.setSource(source.getSequence());
- call.setTarget(target.getSequence());
- call.setId(serverCall.getId());
- call.setDetectPoint(DetectPoint.SERVER);
+ if (!nodeIds.contains(source.getSequence())) {
+ nodes.add(buildNode(nodeCompMap, source));
+ nodeIds.add(source.getSequence());
+ }
+
+ if (!nodeIds.contains(target.getSequence())) {
+ nodes.add(buildNode(nodeCompMap, target));
+ nodeIds.add(target.getSequence());
+ }
- if (source.getSequence() == Const.USER_SERVICE_ID) {
- call.setCallType(Const.EMPTY_STRING);
- } else {
- call.setCallType(nodeCompMap.get(serverCall.getTarget()));
+ String callId = source.getSequence() + Const.ID_SPLIT + target.getSequence();
+ if (!callIds.contains(callId)) {
+ callIds.add(callId);
+
+ Call call = new Call();
+ call.setSource(source.getSequence());
+ call.setTarget(target.getSequence());
+ call.setId(serverCall.getId());
+ call.setDetectPoint(DetectPoint.SERVER);
+
+ if (source.getSequence() == Const.USER_SERVICE_ID) {
+ call.setCallType(Const.EMPTY_STRING);
+ } else {
+ call.setCallType(nodeCompMap.get(serverCall.getTarget()));
+ }
+ calls.add(call);
}
- calls.add(call);
});
Topology topology = new Topology();
@@ -145,23 +162,11 @@ Topology build(List<ServiceComponent> serviceComponents, List<ServiceMapping> se
return topology;
}
- private Set<Integer> buildNodeIds(List<Node> nodes) {
- Set<Integer> nodeIds = new HashSet<>();
- nodes.forEach(node -> nodeIds.add(node.getId()));
- return nodeIds;
- }
-
- private List<Call> serverCallsFilter(List<Call> serviceRelationServerCalls) {
- List<Call> filteredCalls = new LinkedList<>();
-
- serviceRelationServerCalls.forEach(serverCall -> {
- ServiceInventory source = serviceInventoryCache.get(serverCall.getSource());
- if (BooleanUtils.valueToBoolean(source.getIsAddress()) || source.getSequence() == Const.USER_SERVICE_ID) {
- filteredCalls.add(serverCall);
- }
+ private void mappingIdExchange(Map<Integer, Integer> mappings, List<Call> serviceRelationCalls) {
+ serviceRelationCalls.forEach(relationCall -> {
+ relationCall.setSource(mappings.getOrDefault(relationCall.getSource(), relationCall.getSource()));
+ relationCall.setTarget(mappings.getOrDefault(relationCall.getTarget(), relationCall.getTarget()));
});
-
- return filteredCalls;
}
private Map<Integer, Integer> changeMapping2Map(List<ServiceMapping> serviceMappings) {
@@ -189,6 +194,19 @@ Topology build(List<ServiceComponent> serviceComponents, List<ServiceMapping> se
return components;
}
+ private Node buildNode(Map<Integer, String> nodeCompMap, ServiceInventory serviceInventory) {
+ Node serviceNode = new Node();
+ serviceNode.setId(serviceInventory.getSequence());
+ serviceNode.setName(serviceInventory.getName());
+ serviceNode.setType(nodeCompMap.getOrDefault(serviceInventory.getSequence(), Const.UNKNOWN));
+ if (BooleanUtils.valueToBoolean(serviceInventory.getIsAddress())) {
+ serviceNode.setReal(false);
+ } else {
+ serviceNode.setReal(true);
+ }
+ return serviceNode;
+ }
+
private void filterZeroSourceOrTargetReference(List<Call> serviceRelationClientCalls) {
for (int i = serviceRelationClientCalls.size() - 1; i >= 0; i--) {
Call call = serviceRelationClientCalls.get(i);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
index 06be80dfc..74b80fda2 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
@@ -92,27 +92,14 @@ public Topology getServiceTopology(final Step step, final long startTB, final lo
serviceIds.add(mapping.getMappingServiceId());
}
});
+
List<Integer> serviceIdList = new ArrayList<>(serviceIds);
List<Call> serviceRelationClientCalls = getTopologyQueryDAO().loadSpecifiedClientSideServiceRelations(step, startTB, endTB, serviceIdList);
List<Call> serviceRelationServerCalls = getTopologyQueryDAO().loadSpecifiedServerSideServiceRelations(step, startTB, endTB, serviceIdList);
TopologyBuilder builder = new TopologyBuilder(moduleManager);
- Topology topology = builder.build(serviceComponents, new ArrayList<>(), serviceRelationClientCalls, serviceRelationServerCalls);
-
- Set<Integer> nodeIds = new HashSet<>();
- topology.getCalls().forEach(call -> {
- nodeIds.add(call.getSource());
- nodeIds.add(call.getTarget());
- });
-
- for (int i = topology.getNodes().size() - 1; i >= 0; i--) {
- if (!nodeIds.contains(topology.getNodes().get(i).getId())) {
- topology.getNodes().remove(i);
- }
- }
-
- return topology;
+ return builder.build(serviceComponents, serviceMappings, serviceRelationClientCalls, serviceRelationServerCalls);
}
public Topology getEndpointTopology(final Step step, final long startTB, final long endTB,
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services