do not check available agent when retry

Author: Yang Guo

platform-control-center/src/main/java/com/flow/platform/cc/consumer/CmdQueueConsumer.java

@@ -27,6 +27,7 @@
 import com.flow.platform.core.queue.PlatformQueue;
 import com.flow.platform.core.queue.PriorityMessage;
 import com.flow.platform.core.queue.QueueListener;
+import com.flow.platform.core.util.ThreadUtil;
 import com.flow.platform.domain.Cmd;
 import com.flow.platform.domain.CmdStatus;
 import com.flow.platform.util.Logger;
@@ -48,6 +49,8 @@ public class CmdQueueConsumer implements QueueListener<PriorityMessage> {
 
     private final static Logger LOGGER = new Logger(CmdQueueConsumer.class);
 
+    private final static long RETRY_WAIT_TIME = 1000; // in millis
+
     @Value("${queue.cmd.idle_agent.period}")
     private Integer idleAgentPeriod; // period for check idle agent in seconds
 
@@ -88,11 +91,6 @@ public void onQueueItem(PriorityMessage message) {
                 return;
             }
 
-            boolean isTimeout = waitForIdleAgent(cmdId, idleAgentPeriod, idleAgentTimeout);
-            if (isTimeout) {
-                LOGGER.trace("wait for idle agent time out %s seconds for cmd %s", idleAgentTimeout, cmdId);
-            }
-
             Cmd cmd = cmdService.find(cmdId);
 
             // do not re-enqueue if cmd been stopped or killed
@@ -114,36 +112,6 @@ public void onQueueItem(PriorityMessage message) {
         }
     }
 
-    /**
-     * Block current thread and check idle agent
-     *
-     * @param cmdId cmd id
-     * @param period check idle agent period in seconds
-     * @param timeout timeout in seconds
-     * @return is time out exit or not
-     */
-    private boolean waitForIdleAgent(String cmdId, int period, int timeout) {
-        Instant now = Instant.now();
-
-        while (true) {
-            if (Duration.between(now, Instant.now()).toMillis() >= timeout * 1000) {
-                return true;
-            }
-
-            try {
-                Thread.sleep(period * 1000);
-            } catch (InterruptedException ignore) {
-            }
-
-            String zone = cmdService.find(cmdId).getZoneName();
-            int numOfIdle = agentService.findAvailable(zone).size();
-            if (numOfIdle > 0) {
-                LOGGER.trace("has %s idle agent", numOfIdle);
-                return false;
-            }
-        }
-    }
-
     /**
      * Re-enqueue cmd and return num of retry
      */
@@ -153,12 +121,7 @@ private void resend(final CmdQueueItem item, final int retry) {
         }
 
         item.setRetry(retry);
-
-        try {
-            Thread.sleep(1000); // wait 1 seconds and enqueue again with priority
-        } catch (InterruptedException ignore) {
-            // do nothing
-        }
+        ThreadUtil.sleep(RETRY_WAIT_TIME);
 
         // reset cmd status
         PriorityMessage message = PriorityMessage.create(item.toBytes(), QueueConfig.MAX_PRIORITY);

platform-core/src/main/java/com/flow/platform/core/util/ThreadUtil.java

@@ -36,4 +36,12 @@ public static ThreadPoolTaskExecutor createTaskExecutor(int maxPoolSize,
         return taskExecutor;
     }
 
+    public static void sleep(long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException ignore) {
+
+        }
+    }
+
 }