[ISSUE alibaba#5927] Init health check status when loading snapshot o…

…f persistent instances.
pixystone · Jun 2, 2021 · 7f09e8d · 7f09e8d
1 parent 9ab1d62
commit 7f09e8d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/impl/IpPortBasedClient.java b/naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/impl/IpPortBasedClient.java
@@ -112,15 +112,17 @@ public void release() {
     }
 
     private HealthCheckInstancePublishInfo parseToHealthCheckInstance(InstancePublishInfo instancePublishInfo) {
+        HealthCheckInstancePublishInfo result;
         if (instancePublishInfo instanceof HealthCheckInstancePublishInfo) {
-            return (HealthCheckInstancePublishInfo) instancePublishInfo;
+            result = (HealthCheckInstancePublishInfo) instancePublishInfo;
+        } else {
+            result = new HealthCheckInstancePublishInfo();
+            result.setIp(instancePublishInfo.getIp());
+            result.setPort(instancePublishInfo.getPort());
+            result.setHealthy(instancePublishInfo.isHealthy());
+            result.setCluster(instancePublishInfo.getCluster());
+            result.setExtendDatum(instancePublishInfo.getExtendDatum());
         }
-        HealthCheckInstancePublishInfo result = new HealthCheckInstancePublishInfo();
-        result.setIp(instancePublishInfo.getIp());
-        result.setPort(instancePublishInfo.getPort());
-        result.setHealthy(instancePublishInfo.isHealthy());
-        result.setCluster(instancePublishInfo.getCluster());
-        result.setExtendDatum(instancePublishInfo.getExtendDatum());
         if (!ephemeral) {
             result.initHealthCheck();
         }

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/v2/HealthCheckTaskV2.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/v2/HealthCheckTaskV2.java
@@ -98,12 +98,12 @@ public void doHealthCheck() {
                     ClusterMetadata metadata = getClusterMetadata(each, instancePublishInfo);
                     ApplicationUtils.getBean(HealthCheckProcessorV2Delegate.class).process(this, each, metadata);
                     if (Loggers.EVT_LOG.isDebugEnabled()) {
-                        Loggers.EVT_LOG.debug("[HEALTH-CHECK] schedule health check task: {}", client.getClientId());
+                        Loggers.EVT_LOG.debug("[HEALTH-CHECK-V2] schedule health check task: {}", client.getClientId());
                     }
                 }
             }
         } catch (Throwable e) {
-            Loggers.SRV_LOG.error("[HEALTH-CHECK] error while process health check for {}", client.getClientId(), e);
+            Loggers.SRV_LOG.error("[HEALTH-CHECK-V2] error while process health check for {}", client.getClientId(), e);
         } finally {
             if (!cancelled) {
                 HealthCheckReactor.scheduleCheck(this);

diff --git a/.../main/java/com/alibaba/nacos/naming/healthcheck/v2/processor/TcpHealthCheckProcessor.java b/.../main/java/com/alibaba/nacos/naming/healthcheck/v2/processor/TcpHealthCheckProcessor.java
@@ -101,7 +101,7 @@ public void process(HealthCheckTaskV2 task, Service service, ClusterMetadata met
         }
         // TODO handle marked(white list) logic like v1.x.
         if (!instance.tryStartCheck()) {
-            SRV_LOG.warn("tcp check started before last one finished, service: {} : {} : {}:{}",
+            SRV_LOG.warn("[HEALTH-CHECK-V2] tcp check started before last one finished, service: {} : {} : {}:{}",
                     service.getGroupedServiceName(), instance.getCluster(), instance.getIp(), instance.getPort());
             healthCheckCommon
                     .reEvaluateCheckRT(task.getCheckRtNormalized() * 2, task, switchDomain.getTcpHealthParams());
@@ -151,7 +151,7 @@ public void run() {
                     GlobalExecutor.executeTcpSuperSense(new PostProcessor(key));
                 }
             } catch (Throwable e) {
-                SRV_LOG.error("[HEALTH-CHECK] error while processing NIO task", e);
+                SRV_LOG.error("[HEALTH-CHECK-V2] error while processing NIO task", e);
             }
         }
     }