delete agent queue

Author: gy2006

core/src/main/java/com/flowci/core/agent/event/CreateAgentEvent.java

@@ -23,7 +23,6 @@
 import com.flowci.core.agent.domain.SshAgentHost;
 import com.flowci.core.agent.event.AgentCreatedEvent;
 import com.flowci.core.agent.event.AgentHostStatusEvent;
-import com.flowci.core.agent.event.CreateAgentEvent;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
 import com.flowci.core.common.manager.SpringEventManager;
@@ -114,6 +113,9 @@ public class AgentHostServiceImpl implements AgentHostService {
     @Autowired
     private DockerManager dockerManager;
 
+    @Autowired
+    private AgentService agentService;
+
     {
         mapping.put(LocalUnixAgentHost.class, new OnLocalSocketHostCreate());
         mapping.put(SshAgentHost.class, new OnSshHostCreate());
@@ -247,26 +249,26 @@ public boolean start(AgentHost host) {
                 log.warn("Unable to restart agent {}", agent.getName());
 
                 //TODO: send notification
-                agentDao.deleteById(agent.getId());
+                agentService.delete(agent);
                 agents.remove(agent);
             }
         }
 
         // create new agent
         if (agents.size() < host.getMaxSize()) {
             String name = String.format("%s-%s", host.getName(), StringHelper.randomString(5));
-            CreateAgentEvent syncEvent =
-                    eventManager.publish(new CreateAgentEvent(this, name, host.getTags(), host.getId()));
-
-            Agent agent = syncEvent.getFetched();
-            eventManager.publish(new AgentCreatedEvent(this, agent, host));
-
+            Agent agent = null;
             try {
+                agent = agentService.create(name, host.getTags(), Optional.of(host.getId()));
                 cm.start(buildStartOption(agent));
+                eventManager.publish(new AgentCreatedEvent(this, agent, host));
                 log.info("Agent {} been created and started", name);
                 return true;
             } catch (Exception e) {
-                log.warn("Unable to start created agent {}, since {}", agent.getName(), e.getMessage());
+                if (agent != null) {
+                    agentService.delete(agent);
+                    log.warn("Unable to start created agent {}, since {}", agent.getName(), e.getMessage());
+                }
                 return false;
             }
         }
@@ -368,8 +370,6 @@ public void onNoIdleAgent(NoIdleAgentEvent event) {
                 return;
             }
         }
-
-        log.info("Unable to start agent from hosts");
     }
 
     //====================================================================

core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java

@@ -78,6 +78,11 @@ public interface AgentService {
      */
     Agent delete(String token);
 
+    /**
+     * Delete agent by object
+     */
+    void delete(Agent agent);
+
     /**
      * Set agent tags by token
      */

core/src/main/java/com/flowci/core/agent/service/AgentService.java

@@ -23,7 +23,6 @@
 import com.flowci.core.agent.domain.CmdIn;
 import com.flowci.core.agent.event.AgentStatusEvent;
 import com.flowci.core.agent.event.CmdSentEvent;
-import com.flowci.core.agent.event.CreateAgentEvent;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CipherHelper;
 import com.flowci.core.common.helper.ThreadHelper;
@@ -168,10 +167,10 @@ public String getPath(Agent agent) {
     public List<Agent> find(Status status, Set<String> tags) {
         List<Agent> agents;
 
-        if (Objects.isNull(tags) || tags.isEmpty()) {
-            agents = agentDao.findAllByStatus(status);
-        } else {
+        if (ObjectsHelper.hasCollection(tags)) {
             agents = agentDao.findAllByStatusAndTagsIn(status, tags);
+        } else {
+            agents = agentDao.findAllByStatus(status);
         }
 
         return agents;
@@ -180,9 +179,15 @@ public List<Agent> find(Status status, Set<String> tags) {
     @Override
     public Agent delete(String token) {
         Agent agent = getByToken(token);
+        delete(agent);
+        return agent;
+    }
+
+    @Override
+    public void delete(Agent agent) {
         agentDao.delete(agent);
+        agentQueueManager.delete(agent.getQueueName());
         log.debug("{} has been deleted", agent);
-        return agent;
     }
 
     @Override
@@ -324,12 +329,6 @@ public void dispatch(CmdIn cmd, Agent agent) {
     //        %% Spring Event Listener
     //====================================================================
 
-    @EventListener
-    public void onCreateAgentEvent(CreateAgentEvent event) {
-        Agent agent = this.create(event.getName(), event.getTags(), Optional.of(event.getHostId()));
-        event.setFetched(agent);
-    }
-
     @EventListener
     public void notifyToFindAvailableAgent(AgentStatusEvent event) {
         Agent agent = event.getAgent();