Fixing Pipeline resumption (#126)

Co-authored-by: Roman <[email protected]>

Author: jglick

src/main/java/org/jenkinsci/plugins/docker/swarm/DockerSwarmAgent.java

@@ -2,26 +2,19 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jenkinsci.plugins.docker.swarm.docker.api.service.DeleteServiceRequest;
 
 import akka.actor.ActorRef;
 import hudson.model.Descriptor;
-import hudson.model.Label;
-import hudson.model.Node;
 import hudson.model.Queue;
 import hudson.model.TaskListener;
-import hudson.model.labels.LabelAtom;
-import hudson.model.queue.CauseOfBlockage;
 import hudson.slaves.AbstractCloudSlave;
-import hudson.slaves.EphemeralNode;
 import jenkins.model.Jenkins;
 
-public class DockerSwarmAgent extends AbstractCloudSlave implements EphemeralNode {
+public class DockerSwarmAgent extends AbstractCloudSlave {
 
     private static final Logger LOGGER = Logger.getLogger(DockerSwarmAgent.class.getName());
 
@@ -40,40 +33,9 @@ public DockerSwarmComputer createComputer() {
 
     @Override
     protected void _terminate(final TaskListener listener) throws IOException, InterruptedException {
+        DockerSwarmPlugin swarmPlugin = Jenkins.getInstance().getPlugin(DockerSwarmPlugin.class);
+        ActorRef agentLauncherRef = swarmPlugin.getActorSystem().actorFor("/user/" + getComputer().getName());
+        agentLauncherRef.tell(new DeleteServiceRequest(getComputer().getName()), ActorRef.noSender());
     }
 
-    @Override
-    public Node asNode() {
-        return this;
-    }
-
-    @Override
-    public CauseOfBlockage canTake(final Queue.BuildableItem item) {
-        final Label l = item.getAssignedLabel();
-        if (l != null && this.name.equals(l.getName())) {
-            return null;
-        }
-        return super.canTake(item);
-    }
-
-    @Override
-    public Set<LabelAtom> getAssignedLabels() {
-        final TreeSet<LabelAtom> labels = new TreeSet<>();
-        labels.add(new LabelAtom(getLabelString()));
-        return labels;
-    }
-
-    public void terminate() throws IOException {
-        try {
-            DockerSwarmPlugin swarmPlugin = Jenkins.getInstance().getPlugin(DockerSwarmPlugin.class);
-            ActorRef agentLauncherRef = swarmPlugin.getActorSystem().actorFor("/user/" + getComputer().getName());
-            agentLauncherRef.tell(new DeleteServiceRequest(getComputer().getName()), ActorRef.noSender());
-        } finally {
-            try {
-                Jenkins.getInstance().removeNode(this);
-            } catch (IOException e) {
-                LOGGER.log(Level.WARNING, "Failed to remove computer", e);
-            }
-        }
-    }
 }

src/main/java/org/jenkinsci/plugins/docker/swarm/DockerSwarmAgentRetentionStrategy.java

@@ -108,7 +108,7 @@ private synchronized void done(final DockerSwarmComputer c) {
                 if (node != null) {
                     try {
                         node.terminate();
-                    } catch (IOException e) {
+                    } catch (IOException | InterruptedException e) {
                         LOGGER.log(Level.WARNING, "Failed to terminate " + c.getName(), e);
                     }
                 }

src/main/java/org/jenkinsci/plugins/docker/swarm/OneShotProvisionQueueListener.java

@@ -40,7 +40,7 @@ public void onLeft(final Queue.LeftItem li) {
                 Computer.threadPoolForRemoting.submit(() -> {
                     try {
                         ((DockerSwarmAgent) node).terminate();
-                    } catch (IOException e) {
+                    } catch (IOException | InterruptedException e) {
                         LOGGER.log(Level.WARNING, "Failed to terminate agent.", e);
                     }
                 });

src/main/java/org/jenkinsci/plugins/docker/swarm/ResetStuckBuildsInQueueActor.java

@@ -31,7 +31,7 @@ public static Props props() {
         return Props.create(ResetStuckBuildsInQueueActor.class, ResetStuckBuildsInQueueActor::new);
     }
 
-    private void resetStuckBuildsInQueue() throws IOException {
+    private void resetStuckBuildsInQueue() throws IOException, InterruptedException {
         try (ACLContext context = ACL.as(ACL.SYSTEM)) {
             long resetMinutes = Optional.ofNullable(DockerSwarmCloud.get().getTimeoutMinutes()).orElse(DEFAULT_RESET_MINUTES);
             final Queue.Item[] items = Jenkins.getInstance().getQueue().getItems();

src/main/resources/org/jenkinsci/plugins/docker/swarm/DockerSwarmAgentTemplate/config.jelly

@@ -10,10 +10,10 @@
         <f:textbox value="${dockerSwarmAgentTemplate.image}" default="java:8"/>
     </f:entry>
     <f:entry title="Unix Command" field="unixCommand">
-        <f:textarea value="${dockerSwarmAgentTemplate.unixCommand}" default="sh&#10;-cx&#10;curl --connect-timeout 20 --max-time 60 -o agent.jar $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_JAR_URL &amp;&amp; java -classpath agent.jar hudson.remoting.jnlp.Main -headless -url $DOCKER_SWARM_PLUGIN_JENKINS_URL -noreconnect -workDir /tmp $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_SECRET $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_NAME"/>
+        <f:textarea value="${dockerSwarmAgentTemplate.unixCommand}" default="sh&#10;-cx&#10;curl --connect-timeout 20 --max-time 60 -o agent.jar $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_JAR_URL &amp;&amp; java -classpath agent.jar hudson.remoting.jnlp.Main -headless -url $DOCKER_SWARM_PLUGIN_JENKINS_URL  -workDir /tmp $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_SECRET $DOCKER_SWARM_PLUGIN_JENKINS_AGENT_NAME"/>
     </f:entry>
     <f:entry title="Windows Command" field="windowsCommand">
-        <f:textbox value="${dockerSwarmAgentTemplate.windowsCommand}" default="powershell.exe &amp; { Invoke-WebRequest -TimeoutSec 20 -OutFile agent.jar %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_JAR_URL%; if($?) { java -classpath agent.jar hudson.remoting.jnlp.Main -headless -url %DOCKER_SWARM_PLUGIN_JENKINS_URL% -noreconnect %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_SECRET% %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_NAME% } }"/>
+        <f:textbox value="${dockerSwarmAgentTemplate.windowsCommand}" default="powershell.exe &amp; { Invoke-WebRequest -TimeoutSec 20 -OutFile agent.jar %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_JAR_URL%; if($?) { java -classpath agent.jar hudson.remoting.jnlp.Main -headless -url %DOCKER_SWARM_PLUGIN_JENKINS_URL%  %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_SECRET% %DOCKER_SWARM_PLUGIN_JENKINS_AGENT_NAME% } }"/>
     </f:entry>
     <f:entry title="Working Directory" field="workingDir">
         <f:textbox value="${dockerSwarmAgentTemplate.workingDir}" default="/tmp"/>