slave termination and cacthing exception fixed

jenkinsci · Jan 28, 2014 · 8db7f95 · 8db7f95
1 parent 54258e7
commit 8db7f95
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCleanupThread.java b/src/main/java/jenkins/plugins/jclouds/compute/JCloudsCleanupThread.java
@@ -49,12 +49,11 @@ public void run() {
 							logger.log(Level.INFO, "Deleting pending node " + c.getName());
 							try {
 								((JCloudsComputer) c).deleteSlave();
-							} catch (IOException e) {
+							} catch (IOException | InterruptedException e) {
 								logger.log(Level.WARNING, "Failed to disconnect and delete " + c.getName() + ": " + e.getMessage());
 							}
 						}
 					});
-
 					deletedNodesBuilder.add(f);
 				}
 			}

diff --git a/src/main/java/jenkins/plugins/jclouds/compute/JCloudsComputer.java b/src/main/java/jenkins/plugins/jclouds/compute/JCloudsComputer.java
@@ -52,9 +52,11 @@ public HttpResponse doDoDelete() throws IOException {
 	}
 
 	/**
-	 * Delete the slave, terminate the instance. Can be called eitehr by doDoDelete() or from JCloudsRetentionStrategy.
+	 * Delete the slave, terminate the instance. Can be called either by doDoDelete() or from JCloudsRetentionStrategy.
+	 * 
+	 * @throws InterruptedException
 	 */
-	public void deleteSlave() throws IOException {
+	public void deleteSlave() throws IOException, InterruptedException {
 		LOGGER.info("Terminating " + getName() + " slave");
 		JCloudsSlave slave = getNode();
 		if (slave.getChannel() != null) {

diff --git a/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java b/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlave.java
@@ -151,26 +151,6 @@ public AbstractCloudComputer<JCloudsSlave> createComputer() {
 		return new JCloudsComputer(this);
 	}
 
-	/**
-	 * Destroy the node calls {@link ComputeService#destroyNode}
-	 * 
-	 */
-	@Override
-	public void terminate() {
-		final ComputeService compute = JCloudsCloud.getByName(cloudName).getCompute();
-		if (compute.getNodeMetadata(nodeId) != null && compute.getNodeMetadata(nodeId).getStatus().equals(NodeMetadata.Status.RUNNING)) {
-			if (stopOnTerminate) {
-				LOGGER.info("Suspending the Slave : " + getNodeName());
-				compute.suspendNode(nodeId);
-			} else {
-				LOGGER.info("Terminating the Slave : " + getNodeName());
-				compute.destroyNode(nodeId);
-			}
-		} else {
-			LOGGER.info("Slave " + getNodeName() + " is already not running.");
-		}
-	}
-
 	@Extension
 	public static final class JCloudsSlaveDescriptor extends SlaveDescriptor {
 
@@ -188,9 +168,23 @@ public boolean isInstantiable() {
 		}
 	}
 
+	/**
+	 * Destroy the node calls {@link ComputeService#destroyNode}
+	 * 
+	 */
 	@Override
 	protected void _terminate(TaskListener listener) throws IOException, InterruptedException {
-		// TODO Auto-generated method stub
-
+		final ComputeService compute = JCloudsCloud.getByName(cloudName).getCompute();
+		if (compute.getNodeMetadata(nodeId) != null && compute.getNodeMetadata(nodeId).getStatus().equals(NodeMetadata.Status.RUNNING)) {
+			if (stopOnTerminate) {
+				LOGGER.info("Suspending the Slave : " + getNodeName());
+				compute.suspendNode(nodeId);
+			} else {
+				LOGGER.info("Terminating the Slave : " + getNodeName());
+				compute.destroyNode(nodeId);
+			}
+		} else {
+			LOGGER.info("Slave " + getNodeName() + " is already not running.");
+		}
 	}
 }