Merge pull request Netflix#205 from ebukoski/master

Fix warnings, add SimpleDB max retry

Author: ebukoski

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'nebula.netflixoss' version '2.2.9'
     id 'net.saliman.cobertura' version '2.2.7'
+    id 'com.github.hierynomus.license' version '0.11.0'
 }
 
 // Establish version and status
@@ -62,8 +63,9 @@ tasks.withType(JavaCompile) {
 artifacts {
     archives tasks.jar
 }
-import nl.javadude.gradle.plugins.license.License
-tasks.withType(License).each { licenseTask ->
-    licenseTask.exclude '**/*.json'
-    licenseTask.exclude '**/*.properties'
+
+license {
+  exclude '**/*.properties'
+  exclude '**/*.json'
+  exclude '**/*.sh'
 }

src/main/java/com/netflix/simianarmy/aws/janitor/crawler/edda/EddaEBSVolumeJanitorCrawler.java

@@ -166,7 +166,7 @@ private List<Resource> getVolumeResources(String... volumeIds) {
      * Gets all volumes that are not attached to any instance. Janitor Monkey only considers unattached volumes
      * as cleanup candidates, so there is no need to get volumes that are in-use.
      * @param region
-     * @return
+     * @return list of resources that are not attached to any instance
      */
     private List<Resource> getUnattachedVolumeResourcesInRegion(String region, String... volumeIds) {
         String url = eddaClient.getBaseUrl(region) + "/aws/volumes;";

src/main/java/com/netflix/simianarmy/basic/BasicSimianArmyContext.java

@@ -397,7 +397,7 @@ public AWSCredentialsProvider getAwsCredentialsProvider() {
      * (Duplicates a method in MonkeyServer; refactor to util?).
      *
      * @param key
-     * @return
+     * @return the loaded class or null if the class is not found
      */
     @SuppressWarnings("rawtypes")
     private Class loadClientClass(String key) {

src/main/java/com/netflix/simianarmy/client/aws/AWSClient.java

@@ -119,11 +119,16 @@ public class AWSClient implements CloudClient {
     /** The plain name for AWS account */
     private final String accountName;
 
+    /** Maximum retry count for Simple DB */
+    private static final int SIMPLE_DB_MAX_RETRY = 11;
+
     private final AWSCredentialsProvider awsCredentialsProvider;
 
     private final ClientConfiguration awsClientConfig;
 
     private ComputeService jcloudsComputeService;
+    
+    
 
     /**
      * This constructor will let the AWS SDK obtain the credentials, which will
@@ -220,7 +225,7 @@ public String region() {
     /**
      * The accountName.
      *
-     * @accountName the plain name for the aws account easier to identify which account
+     * @return the plain name for the aws account easier to identify which account
      * monkey is running in
      */
     public String accountName() {
@@ -306,19 +311,19 @@ protected AmazonElasticLoadBalancingClient elbClient() {
      */
     public AmazonSimpleDB sdbClient() {
         AmazonSimpleDB client;
-        if (awsClientConfig == null) {
-            if (awsCredentialsProvider == null) {
-                client = new AmazonSimpleDBClient();
-            } else {
-                client = new AmazonSimpleDBClient(awsCredentialsProvider);
-            }
+        ClientConfiguration cc = awsClientConfig;
+        
+        if (cc == null) { 
+          cc = new ClientConfiguration();
+          cc.setMaxErrorRetry(SIMPLE_DB_MAX_RETRY);
+        }
+        
+        if (awsCredentialsProvider == null) {
+            client = new AmazonSimpleDBClient(cc);
         } else {
-            if (awsCredentialsProvider == null) {
-                client = new AmazonSimpleDBClient(awsClientConfig);
-            } else {
-                client = new AmazonSimpleDBClient(awsCredentialsProvider, awsClientConfig);
-            }
+            client = new AmazonSimpleDBClient(awsCredentialsProvider, cc);
         }
+        
         // us-east-1 has special naming
         // http://docs.amazonwebservices.com/general/latest/gr/rande.html#sdb_region
         if (region == null || region.equals("us-east-1")) {
@@ -328,7 +333,7 @@ public AmazonSimpleDB sdbClient() {
         }
         return client;
     }
-
+    
     /**
      * Describe auto scaling groups.
      *

src/main/java/com/netflix/simianarmy/janitor/AbstractJanitor.java

@@ -295,8 +295,8 @@ public void cleanupResources() {
                         markedResource.setState(Resource.CleanupState.JANITOR_TERMINATED);
                         resourceTracker.addOrUpdate(markedResource);
                     } catch (Exception e) {
-                        LOGGER.error(String.format("Failed to clean up the resource %s.",
-                                markedResource.getId()), e);
+                        LOGGER.error(String.format("Failed to clean up the resource %s of type %s.",
+                                markedResource.getId(), markedResource.getResourceType().name()), e);
                         failedToCleanResources.add(markedResource);
                         continue;
                     }

src/test/java/com/netflix/simianarmy/janitor/TestAbstractJanitor.java

@@ -570,7 +570,7 @@ public ImmediateCleanupRule(DateTime now) {
     @Override
     public boolean isValid(Resource resource) {
         resource.setExpectedTerminationTime(new Date(now.minusMinutes(10).getMillis()));
-        resource.setNotificationTime(new Date(now.getMillis()));
+        resource.setNotificationTime(new Date(now.getMillis()-5000));
         return false;
     }
 }