Merge pull request apache#647 from @wido

remibergsma · remibergsma · commit 60633301ac97 · 2015-08-03T20:16:04.000+02:00
CLOUDSTACK-8640: Revert to AWS SDK 1.3.22

* pr/647:
  CLOUDSTACK-8640: Revert to AWS SDK 1.3.22

Signed-off-by: Remi Bergsma &lt;github@remi.nl&gt;
diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
     <org.springframework.version>3.2.12.RELEASE</org.springframework.version>
     <cs.mockito.version>1.9.5</cs.mockito.version>
     <cs.powermock.version>1.5.3</cs.powermock.version>
-    <cs.aws.sdk.version>1.9.8</cs.aws.sdk.version>
+    <cs.aws.sdk.version>1.3.22</cs.aws.sdk.version>
     <cs.lang.version>2.6</cs.lang.version>
     <cs.lang3.version>3.4</cs.lang3.version>
     <cs.commons-io.version>2.4</cs.commons-io.version>
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
@@ -103,17 +103,19 @@ public static AmazonS3 acquireClient(final ClientOptions clientOptions) {
         }
 
         if (clientOptions.getUseTCPKeepAlive() != null) {
-            configuration.setUseTcpKeepAlive(clientOptions.getUseTCPKeepAlive());
+            //configuration.setUseTcpKeepAlive(clientOptions.getUseTCPKeepAlive());
+            LOGGER.debug("useTCPKeepAlive not supported by old AWS SDK");
         }
 
         if (clientOptions.getConnectionTtl() != null) {
-            configuration.setConnectionTTL(clientOptions.getConnectionTtl());
+            //configuration.setConnectionTTL(clientOptions.getConnectionTtl());
+            LOGGER.debug("connectionTtl not supported by old AWS SDK");
         }
 
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(format("Creating S3 client with configuration: [protocol: %1$s, connectionTimeOut: " + "%2$s, maxErrorRetry: %3$s, socketTimeout: %4$s, useTCPKeepAlive: %5$s, connectionTtl: %6$s]",
                 configuration.getProtocol(), configuration.getConnectionTimeout(), configuration.getMaxErrorRetry(), configuration.getSocketTimeout(),
-                configuration.useTcpKeepAlive(), configuration.getConnectionTTL()));
+                -1, -1));
         }
 
         final AmazonS3Client client = new AmazonS3Client(credentials, configuration);

Original file line number	Diff line number	Diff line change
`@@ -103,17 +103,19 @@ public static AmazonS3 acquireClient(final ClientOptions clientOptions) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if (clientOptions.getUseTCPKeepAlive() != null) {`
`106`		`- configuration.setUseTcpKeepAlive(clientOptions.getUseTCPKeepAlive());`
	`106`	`+ //configuration.setUseTcpKeepAlive(clientOptions.getUseTCPKeepAlive());`
	`107`	`+ LOGGER.debug("useTCPKeepAlive not supported by old AWS SDK");`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`if (clientOptions.getConnectionTtl() != null) {`
`110`		`- configuration.setConnectionTTL(clientOptions.getConnectionTtl());`
	`111`	`+ //configuration.setConnectionTTL(clientOptions.getConnectionTtl());`
	`112`	`+ LOGGER.debug("connectionTtl not supported by old AWS SDK");`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`if (LOGGER.isDebugEnabled()) {`
`114`	`116`	`LOGGER.debug(format("Creating S3 client with configuration: [protocol: %1$s, connectionTimeOut: " + "%2$s, maxErrorRetry: %3$s, socketTimeout: %4$s, useTCPKeepAlive: %5$s, connectionTtl: %6$s]",`
`115`	`117`	`configuration.getProtocol(), configuration.getConnectionTimeout(), configuration.getMaxErrorRetry(), configuration.getSocketTimeout(),`
`116`		`- configuration.useTcpKeepAlive(), configuration.getConnectionTTL()));`
	`118`	`+ -1, -1));`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`final AmazonS3Client client = new AmazonS3Client(credentials, configuration);`