[incubator-skywalking] branch thread-model updated: Make instance heartbeat works.

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch thread-model
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/thread-model by this push:
     new 97d7a32  Make instance heartbeat works.
97d7a32 is described below

commit 97d7a323dfdbdd5d5237d6220ebaf11bb162104b
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Tue Feb 19 23:22:04 2019 +0800

    Make instance heartbeat works.
---
 .../aop/server/receiver/mesh/TelemetryDataDispatcher.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
 
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index e0452f8..b0c1326 100644
--- 
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++ 
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -91,13 +91,14 @@ public class TelemetryDataDispatcher {
     private static void heartbeat(ServiceMeshMetricDataDecorator decorator, 
long minuteTimeBucket) {
         ServiceMeshMetric metric = decorator.getMetric();
 
+        int heartbeatCycle = 10000;
         // source
-        
SERVICE_INSTANCE_INVENTORY_REGISTER.heartbeat(metric.getSourceServiceInstanceId(),
 metric.getEndTime());
         int instanceId = metric.getSourceServiceInstanceId();
         ServiceInstanceInventory serviceInstanceInventory = 
SERVICE_INSTANCE_CACHE.get(instanceId);
         if (Objects.nonNull(serviceInstanceInventory)) {
-            if (metric.getEndTime() - 
serviceInstanceInventory.getHeartbeatTime() > 10 * 1000L) {
+            if (metric.getEndTime() - 
serviceInstanceInventory.getHeartbeatTime() > heartbeatCycle) {
                 // trigger heartbeat every 10s.
+                
SERVICE_INSTANCE_INVENTORY_REGISTER.heartbeat(metric.getSourceServiceInstanceId(),
 metric.getEndTime());
                 
SERVICE_INVENTORY_REGISTER.heartbeat(serviceInstanceInventory.getServiceId(), 
metric.getEndTime());
             }
         } else {
@@ -105,12 +106,12 @@ public class TelemetryDataDispatcher {
         }
 
         // dest
-        
SERVICE_INSTANCE_INVENTORY_REGISTER.heartbeat(metric.getDestServiceInstanceId(),
 metric.getEndTime());
         instanceId = metric.getDestServiceInstanceId();
         serviceInstanceInventory = SERVICE_INSTANCE_CACHE.get(instanceId);
         if (Objects.nonNull(serviceInstanceInventory)) {
-            if (metric.getEndTime() - 
serviceInstanceInventory.getHeartbeatTime() > 10 * 1000L) {
+            if (metric.getEndTime() - 
serviceInstanceInventory.getHeartbeatTime() > heartbeatCycle) {
                 // trigger heartbeat every 10s.
+                
SERVICE_INSTANCE_INVENTORY_REGISTER.heartbeat(metric.getDestServiceInstanceId(),
 metric.getEndTime());
                 
SERVICE_INVENTORY_REGISTER.heartbeat(serviceInstanceInventory.getServiceId(), 
metric.getEndTime());
             }
         } else {