code clean up about host offline timeout

Author: gy2006

core/src/main/java/com/flowci/core/agent/domain/AgentHost.java

@@ -16,21 +16,16 @@
 
 package com.flowci.core.agent.domain;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.flowci.core.common.domain.Mongoable;
-
-import org.springframework.data.mongodb.core.index.Indexed;
-
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Getter
 @Setter
 @Document(collection = "agent_host")
@@ -73,17 +68,7 @@ public enum Type {
     /**
      * Max agent size on the host
      */
-    private int maxSize = 10;
-
-    /**
-     * Stop agent container if over the idle seconds
-     */
-    private int maxIdleSeconds = 3600;
-
-    /**
-     * Remove agent container if over the offline seconds
-     */
-    private int maxOfflineSeconds = 600;
+    private int maxSize = 5;
 
     /**
      * Tags for all agent holed by host
@@ -94,18 +79,4 @@ public enum Type {
      * Error message if connection fail
      */
     private String error;
-
-    public boolean isOverMaxIdleSeconds(Date date) {
-        if (maxIdleSeconds == NoLimit) {
-            return false;
-        }
-        return date.toInstant().plus(maxIdleSeconds, ChronoUnit.SECONDS).isBefore(Instant.now());
-    }
-
-    public boolean isOverMaxOfflineSeconds(Date date) {
-        if (maxOfflineSeconds == NoLimit) {
-            return false;
-        }
-        return date.toInstant().plus(maxOfflineSeconds, ChronoUnit.SECONDS).isBefore(Instant.now());
-    }
 }

core/src/main/java/com/flowci/core/agent/domain/CreateOrUpdateSshAgentHost.java

@@ -45,11 +45,7 @@ public class CreateOrUpdateSshAgentHost {
 
     private String ip;
 
-    private int maxSize = 10;
-
-    private int maxIdleSeconds = 3600;
-
-    private int maxOfflineSeconds = 600;
+    private int maxSize = 5;
 
     public AgentHost toObj() {
         if (type == AgentHost.Type.SSH) {
@@ -61,8 +57,6 @@ public AgentHost toObj() {
             host.setIp(ip);
             host.setTags(tags);
             host.setMaxSize(maxSize);
-            host.setMaxIdleSeconds(maxIdleSeconds);
-            host.setMaxOfflineSeconds(maxOfflineSeconds);
             return host;
         }
 
@@ -71,8 +65,6 @@ public AgentHost toObj() {
             host.setId(id);
             host.setName(name);
             host.setMaxSize(maxSize);
-            host.setMaxIdleSeconds(maxIdleSeconds);
-            host.setMaxOfflineSeconds(maxOfflineSeconds);
             return host;
         }
 

core/src/main/java/com/flowci/core/job/service/LocalTaskServiceImpl.java

@@ -37,7 +37,7 @@ public class LocalTaskServiceImpl implements LocalTaskService {
 
     private static final String DefaultImage = "flowci/plugin-runtime";
 
-    private static final int DefaultTimeout = 120; // seconds
+    private static final int DefaultTimeout = 300; // seconds
 
     @Autowired
     private String serverUrl;

core/src/test/java/com/flowci/core/test/agent/AgentHostServiceTest.java

@@ -11,10 +11,6 @@
 import org.junit.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.sql.Date;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-
 public class AgentHostServiceTest extends ZookeeperScenario {
 
     @Autowired
@@ -82,34 +78,6 @@ public void should_start_agents_on_host() {
         Assert.assertEquals(0, agentService.list().size());
     }
 
-    @Ignore
-    @Test
-    public void should_should_over_time_limit() {
-        AgentHost host = new LocalUnixAgentHost();
-        host.setMaxIdleSeconds(1800);
-        host.setMaxOfflineSeconds(600);
-
-        // test idle limit
-        Instant updatedAt = Instant.now().minus(1, ChronoUnit.HOURS);
-        Assert.assertTrue(host.isOverMaxIdleSeconds(Date.from(updatedAt)));
-
-        updatedAt = Instant.now().minus(2, ChronoUnit.SECONDS);
-        Assert.assertFalse(host.isOverMaxIdleSeconds(Date.from(updatedAt)));
-
-        host.setMaxIdleSeconds(AgentHost.NoLimit);
-        Assert.assertFalse(host.isOverMaxIdleSeconds(Date.from(updatedAt)));
-
-        // test offline limit
-        updatedAt = Instant.now().minus(2, ChronoUnit.HOURS);
-        Assert.assertTrue(host.isOverMaxOfflineSeconds(Date.from(updatedAt)));
-
-        updatedAt = Instant.now().minus(5, ChronoUnit.MINUTES);
-        Assert.assertFalse(host.isOverMaxOfflineSeconds(Date.from(updatedAt)));
-
-        host.setMaxIdleSeconds(AgentHost.NoLimit);
-        Assert.assertFalse(host.isOverMaxOfflineSeconds(Date.from(updatedAt)));
-    }
-
     @Ignore
     @Test
     public void should_sync_agents() {