Catch AmazonClientExceptions to prevent connection loss

If the AWS client throws an exception (e.g: because of a DNS failure) it will end up killing the rejoin thread and stop retrying which can lead to a node getting stuck unable to rejoin the cluster. Closes elastic#30.

Author: Gianni O'Neill

src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java

@@ -19,6 +19,7 @@
 
 package org.elasticsearch.discovery.ec2;
 
+import com.amazonaws.AmazonClientException;
 import com.amazonaws.services.ec2.AmazonEC2;
 import com.amazonaws.services.ec2.model.*;
 import org.elasticsearch.Version;
@@ -96,7 +97,14 @@ public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportS
  public List<DiscoveryNode> buildDynamicNodes() {
  List<DiscoveryNode> discoNodes = Lists.newArrayList();
 
- DescribeInstancesResult descInstances = client.describeInstances(new DescribeInstancesRequest());
+ DescribeInstancesResult descInstances;
+ try {
+ descInstances = client.describeInstances(new DescribeInstancesRequest());
+ } catch (AmazonClientException e) {
+ logger.info("Exception while retrieving instance list from AWS API: {}", e.getMessage());
+ logger.debug("Full exception:", e);
+ return discoNodes;
+ }
 
  logger.trace("building dynamic unicast discovery nodes...");
  for (Reservation reservation : descInstances.getReservations()) {