alibaba · KomachiSion · Nov 1, 2020 · Nov 1, 2020 · Nov 1, 2020 · Nov 1, 2020
diff --git a/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java b/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java
@@ -58,6 +58,20 @@ public static int toInt(String val, int defaultValue) {
         }
     }
 
+    /**
+     * Convert Object value to long value if parameter value is legal.
+     * And it automatically defaults to 0 if parameter value is null or other object.
+     *
+     * @param val object value
+     * @return Converted long value and its default value is 0.
+     */
+    public static long toLong(Object val) {
+        if (val instanceof Long) {
+            return (Long) val;
+        }
+        return toLong(val.toString());
+    }
+
     /**
      * Convert String value to long value if parameter value is legal. And it automatically defaults to 0 if parameter
      * value is null or blank str.

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/InstanceOperatorClientImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/core/InstanceOperatorClientImpl.java
@@ -27,7 +27,7 @@
 import com.alibaba.nacos.naming.core.v2.index.ServiceStorage;
 import com.alibaba.nacos.naming.core.v2.pojo.Service;
 import com.alibaba.nacos.naming.core.v2.service.ClientOperationService;
-import com.alibaba.nacos.naming.healthcheck.ClientBeatProcessorV2;
+import com.alibaba.nacos.naming.healthcheck.heartbeat.ClientBeatProcessorV2;
 import com.alibaba.nacos.naming.healthcheck.HealthCheckReactor;
 import com.alibaba.nacos.naming.healthcheck.RsInfo;
 import com.alibaba.nacos.naming.misc.Loggers;

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
@@ -20,7 +20,7 @@
 import com.alibaba.nacos.naming.core.v2.pojo.HeartBeatInstancePublishInfo;
 import com.alibaba.nacos.naming.core.v2.pojo.InstancePublishInfo;
 import com.alibaba.nacos.naming.core.v2.pojo.Service;
-import com.alibaba.nacos.naming.healthcheck.ClientBeatCheckTaskV2;
+import com.alibaba.nacos.naming.healthcheck.heartbeat.ClientBeatCheckTaskV2;
 import com.alibaba.nacos.naming.healthcheck.HealthCheckReactor;
 
 import java.util.Collection;

diff --git a/...n/java/com/alibaba/nacos/naming/core/v2/client/manager/impl/IpPortBasedClientManager.java b/...n/java/com/alibaba/nacos/naming/core/v2/client/manager/impl/IpPortBasedClientManager.java
@@ -23,7 +23,7 @@
 import com.alibaba.nacos.naming.core.v2.client.impl.IpPortBasedClient;
 import com.alibaba.nacos.naming.core.v2.client.manager.ClientManager;
 import com.alibaba.nacos.naming.core.v2.event.client.ClientEvent;
-import com.alibaba.nacos.naming.healthcheck.ClientBeatUpdateTask;
+import com.alibaba.nacos.naming.healthcheck.heartbeat.ClientBeatUpdateTask;
 import com.alibaba.nacos.naming.misc.GlobalExecutor;
 import com.alibaba.nacos.naming.misc.Loggers;
 import com.alibaba.nacos.naming.misc.NamingExecuteTaskDispatcher;

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
@@ -19,6 +19,7 @@
 import com.alibaba.nacos.common.http.Callback;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.utils.JacksonUtils;
+import com.alibaba.nacos.naming.healthcheck.heartbeat.BeatCheckTask;
 import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import com.alibaba.nacos.naming.consistency.KeyBuilder;
 import com.alibaba.nacos.naming.core.DistroMapper;

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskV2.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskV2.java
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java
@@ -16,6 +16,7 @@
 
 package com.alibaba.nacos.naming.healthcheck;
 
+import com.alibaba.nacos.naming.healthcheck.heartbeat.BeatProcessor;
 import com.alibaba.nacos.sys.utils.ApplicationUtils;
 import com.alibaba.nacos.naming.core.Cluster;
 import com.alibaba.nacos.naming.core.Instance;

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
@@ -16,6 +16,8 @@
 
 package com.alibaba.nacos.naming.healthcheck;
 
+import com.alibaba.nacos.naming.healthcheck.heartbeat.BeatCheckTask;
+import com.alibaba.nacos.naming.healthcheck.interceptor.HealthCheckTaskInterceptWrapper;
 import com.alibaba.nacos.naming.misc.GlobalExecutor;
 import com.alibaba.nacos.naming.misc.Loggers;
 
@@ -51,7 +53,11 @@ public static ScheduledFuture<?> scheduleCheck(HealthCheckTask task) {
      * @param task client beat check task
      */
     public static void scheduleCheck(BeatCheckTask task) {
-        futureMap.putIfAbsent(task.taskKey(), GlobalExecutor.scheduleNamingHealth(task, 5000, 5000, TimeUnit.MILLISECONDS));
+        Runnable wrapperTask =
+                task instanceof NacosHealthCheckTask ? new HealthCheckTaskInterceptWrapper((NacosHealthCheckTask) task)
+                        : task;
+        futureMap.putIfAbsent(task.taskKey(),
+                GlobalExecutor.scheduleNamingHealth(wrapperTask, 5000, 5000, TimeUnit.MILLISECONDS));
     }
 
     /**

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NacosHealthCheckTask.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/NacosHealthCheckTask.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.naming.healthcheck;
+
+import com.alibaba.nacos.naming.interceptor.Interceptable;
+
+/**
+ * Nacos health check task.
+ *
+ * @author xiweng.yy
+ */
+public interface NacosHealthCheckTask extends Interceptable, Runnable {
+
+    /**
+     * Get task id.
+     *
+     * @return task id.
+     */
+    String getTaskId();
+
+    /**
+     * Do health check.
+     */
+    void doHealthCheck();
+}
diff --git a/...ain/java/com/alibaba/nacos/naming/healthcheck/heartbeat/AbstractBeatCheckInterceptor.java b/...ain/java/com/alibaba/nacos/naming/healthcheck/heartbeat/AbstractBeatCheckInterceptor.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.nacos.naming.healthcheck.heartbeat;
+
+import com.alibaba.nacos.naming.interceptor.NacosNamingInterceptor;
+
+/**
+ * Abstract Beat check Interceptor.
+ *
+ * @author xiweng.yy
+ */
+public abstract class AbstractBeatCheckInterceptor implements NacosNamingInterceptor<InstanceBeatCheckTask> {
+
+    @Override
+    public boolean isInterceptType(Class<?> type) {
+        return InstanceBeatCheckTask.class.isAssignableFrom(type);
+    }
+}
diff --git a/...cos/naming/healthcheck/BeatCheckTask.java → .../healthcheck/heartbeat/BeatCheckTask.java b/...cos/naming/healthcheck/BeatCheckTask.java → .../healthcheck/heartbeat/BeatCheckTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.naming.healthcheck;
+package com.alibaba.nacos.naming.healthcheck.heartbeat;
 
 /**
  * Check and update statues of ephemeral instances, remove them if they have been expired.
@@ -29,4 +29,5 @@ public interface BeatCheckTask extends Runnable {
      * @return task key
      */
     String taskKey();
+
 }
diff --git a/...cos/naming/healthcheck/BeatProcessor.java → .../healthcheck/heartbeat/BeatProcessor.java b/...cos/naming/healthcheck/BeatProcessor.java → .../healthcheck/heartbeat/BeatProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.nacos.naming.healthcheck;
+package com.alibaba.nacos.naming.healthcheck.heartbeat;
 
 /**
  * Thread to update ephemeral instance triggered by client beat.