bugfix fix collector run cyclic when connect auth failed (#1256)

apache · Sep 23, 2023 · 69bb0e2 · 69bb0e2
1 parent 8aba410
commit 69bb0e2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/...in/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java b/...in/java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoCloseProcessor.java
@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.hertzbeat.collector.dispatch.entrance.CollectServer;
 import org.dromara.hertzbeat.collector.dispatch.timer.TimerDispatch;
+import org.dromara.hertzbeat.common.constants.CommonConstants;
 import org.dromara.hertzbeat.common.entity.message.ClusterMsg;
 import org.dromara.hertzbeat.common.support.SpringContextHolder;
 import org.dromara.hertzbeat.remoting.netty.NettyRemotingProcessor;
@@ -27,6 +28,9 @@ public ClusterMsg.Message handle(ChannelHandlerContext ctx, ClusterMsg.Message m
         if (this.timerDispatch == null) {
             this.timerDispatch = SpringContextHolder.getBean(TimerDispatch.class);
         }
+        if (message.getMsg().contains(CommonConstants.COLLECTOR_AUTH_FAILED)) {
+            log.error("receive client auth failed message and go close. {}", message.getMsg());
+        }
         this.timerDispatch.goOffline();
         this.collectServer.shutdown();
         SpringApplication.exit(SpringContextHolder.getApplicationContext(), () -> 0);

diff --git a/.../java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java b/.../java/org/dromara/hertzbeat/collector/dispatch/entrance/processor/GoOfflineProcessor.java
@@ -24,6 +24,11 @@ public ClusterMsg.Message handle(ChannelHandlerContext ctx, ClusterMsg.Message m
         }
         timerDispatch.goOffline();
         log.info("receive offline message and handle success");
+        message.getMsg();
+        if (message.getMsg().contains(CommonConstants.COLLECTOR_AUTH_FAILED)) {
+            log.error("receive client auth failed message and go offline. {}", message.getMsg());
+            return null;
+        }
         return ClusterMsg.Message.newBuilder()
                 .setIdentity(message.getIdentity())
                 .setDirection(ClusterMsg.Direction.RESPONSE)

diff --git a/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java b/common/src/main/java/org/dromara/hertzbeat/common/constants/CommonConstants.java
@@ -316,4 +316,9 @@ public interface CommonConstants {
      * collector mode private
      */
     String MODE_PRIVATE = "private";
+
+    /**
+     * collector auth failed message
+     */
+    String COLLECTOR_AUTH_FAILED = "Auth Failed";
 }