[INLONG-10094][agent] Modify based on comments

apache · Apr 28, 2024 · 54bc3a4 · 54bc3a4
1 parent b9d425e
commit 54bc3a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...agent/agent-core/src/main/java/org/apache/inlong/agent/core/instance/InstanceManager.java b/...agent/agent-core/src/main/java/org/apache/inlong/agent/core/instance/InstanceManager.java
@@ -178,7 +178,8 @@ private Runnable coreThread() {
     }
 
     private void printInstanceState() {
-        if (AgentUtils.getCurrentTime() - lastPrintTime > INSTANCE_PRINT_INTERVAL_MS) {
+        long currentTime = AgentUtils.getCurrentTime();
+        if (currentTime - lastPrintTime > INSTANCE_PRINT_INTERVAL_MS) {
             List<InstanceProfile> instances = instanceDb.getInstances(taskId);
             InstancePrintStat stat = new InstancePrintStat();
             for (int i = 0; i < instances.size(); i++) {
@@ -188,7 +189,7 @@ private void printInstanceState() {
             LOGGER.info(
                     "instanceManager running! taskId {} mem {} db total {} {} action count {}",
                     taskId, instanceMap.size(), instances.size(), stat, actionQueue.size());
-            lastPrintTime = AgentUtils.getCurrentTime();
+            lastPrintTime = currentTime;
         }
     }
 

diff --git a/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/OffsetManager.java b/inlong-agent/agent-core/src/main/java/org/apache/inlong/agent/core/task/OffsetManager.java
@@ -143,20 +143,20 @@ private void cleanDbInstance() {
             String taskId = instanceFromDb.getTaskId();
             String instanceId = instanceFromDb.getInstanceId();
             if (instanceFromDb.getState() != InstanceStateEnum.FINISHED) {
-                return;
+                continue;
             }
             TaskProfile taskFromDb = taskProfileDb.getTask(taskId);
             if (taskFromDb != null) {
                 if (taskFromDb.getCycleUnit().compareToIgnoreCase(CycleUnitType.REAL_TIME) == 0) {
-                    return;
+                    continue;
                 }
                 if (taskFromDb.isRetry()) {
                     if (taskFromDb.getState() != TaskStateEnum.RETRY_FINISH) {
-                        return;
+                        continue;
                     }
                 } else {
                     if (instanceFromDb.getState() != InstanceStateEnum.FINISHED) {
-                        return;
+                        continue;
                     }
                 }
             }