cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 6063330
Date Mon, 03 Aug 2015 18:28:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master c5ebb68be -> 60633301a


CLOUDSTACK-8640: Revert to AWS SDK 1.3.22

The newer SDKs API changed which causes our S3 Template Downloader to never complete.

Although we should fix the Template Downloader we can revert to the old AWS SDK for now.

The fix on the longer run will be rewriting the S3 Template Downloader.

Two methods had to be disabled for now since the old SDK does not support them. They can
be re-enabled when the Template Downloader has been fixed.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c32656a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c32656a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c32656a7

Branch: refs/heads/master
Commit: c32656a7ef13bc952899486026d5a4bf60ff6509
Parents: 22f194b
Author: Wido den Hollander <wido@widodh.nl>
Authored: Fri Jul 31 11:26:53 2015 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Fri Jul 31 12:52:28 2015 +0200

----------------------------------------------------------------------
 pom.xml                                | 2 +-
 utils/src/com/cloud/utils/S3Utils.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32656a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e76d747..bd0c4c3 100644
--- 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>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c32656a7/utils/src/com/cloud/utils/S3Utils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/S3Utils.java b/utils/src/com/cloud/utils/S3Utils.java
index fc8a3cc..7df3d3b 100644
--- a/utils/src/com/cloud/utils/S3Utils.java
+++ b/utils/src/com/cloud/utils/S3Utils.java
@@ -103,17 +103,19 @@ public final class S3Utils {
         }
 
         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);


Mime
View raw message