Merge pull request #65 from mriddle/master

JENKINS-19500 Fix: Unable to delete slave for spot request that no longer exists.
jenkinsci · Sep 9, 2013 · 53d256a · 53d256a
2 parents c33e297 + 6a105ea
commit 53d256a
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/EC2SpotSlave.java b/src/main/java/hudson/plugins/ec2/EC2SpotSlave.java
@@ -92,9 +92,22 @@ private SpotInstanceRequest getSpotRequest(String spotRequestId){
 		AmazonEC2 ec2 = cloud.connect();
 
 		DescribeSpotInstanceRequestsRequest dsirRequest = new DescribeSpotInstanceRequestsRequest().withSpotInstanceRequestIds(spotRequestId);
-		DescribeSpotInstanceRequestsResult dsirResult = ec2.describeSpotInstanceRequests(dsirRequest);
-		List<SpotInstanceRequest> siRequests = dsirResult.getSpotInstanceRequests();
-		if (siRequests.size() <= 0) return null;
+		DescribeSpotInstanceRequestsResult dsirResult = null;
+		List<SpotInstanceRequest> siRequests = null;
+
+		try{
+			dsirResult = ec2.describeSpotInstanceRequests(dsirRequest);
+			siRequests = dsirResult.getSpotInstanceRequests();
+
+		} catch (AmazonServiceException e){
+			// Spot request is no longer valid
+			LOGGER.log(Level.WARNING, "Failed to fetch spot instance request for requestId: " + spotRequestId);
+		} catch (AmazonClientException e){
+			// Spot request is no longer valid
+			LOGGER.log(Level.WARNING, "Failed to fetch spot instance request for requestId: " + spotRequestId);
+		}
+
+		if (dsirResult == null || siRequests.size() <= 0) return null;
 		return siRequests.get(0);
 	}