[INLONG-9233][Agent] Fix bug: source, proxy, sender get stuck (apache…

…#9234)
vernedeng · Nov 8, 2023 · 33df4f5 · 33df4f5
1 parent b5d92d1
commit 33df4f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...ent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java b/...ent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/ProxySink.java
@@ -71,7 +71,7 @@ public void write(Message message) {
             return;
         }
         boolean suc = false;
-        while (!suc) {
+        while (running && !suc) {
             suc = putInCache(message);
             if (!suc) {
                 AgentUtils.silenceSleepInMs(WRITE_FAILED_WAIT_TIME_MS);

diff --git a/...plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java b/...plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/filecollect/SenderManager.java
@@ -246,11 +246,13 @@ private void createMessageSender(String tagName) throws Exception {
     }
 
     public void sendBatch(SenderMessage message) {
-        while (!resendQueue.isEmpty()) {
+        while (!shutdown && !resendQueue.isEmpty()) {
             AgentUtils.silenceSleepInMs(retrySleepTime);
         }
         addAckInfo(message.getAckInfo());
-        sendBatchWithRetryCount(message, 0);
+        if (!shutdown) {
+            sendBatchWithRetryCount(message, 0);
+        }
     }
 
     private void addAckInfo(PackageAckInfo info) {

diff --git a/...ent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java b/...ent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java
@@ -378,7 +378,7 @@ private boolean waitForPermit(String permitName, int permitLen) {
             suc = MemoryManager.getInstance().tryAcquire(permitName, permitLen);
             if (!suc) {
                 MemoryManager.getInstance().printDetail(permitName, "log file source");
-                if (!isRunnable()) {
+                if (!isInodeChanged() || !isRunnable()) {
                     return false;
                 }
                 AgentUtils.silenceSleepInSeconds(1);