cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to effa4c7
Date Sat, 11 Jan 2014 01:13:03 GMT
Updated Branches:
  refs/heads/master 5adc778d8 -> effa4c75b


CLOUDSTACK-5843
For some reason the mgmt server is required to have access to the template
being registered in order to check its size against resource limits
during registration. This is bad, but worse, it's a sync call, so this
call can hang for up to the default HTTP connection timeout.

Reducing http timeout as a quick workaround, but this check needs to
1) be removed or 2) done later or 3)registerTemplate needs to be async
and 4) moved off the mgmt server (ssvm is the only thing that needs access to
template url).


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

Branch: refs/heads/master
Commit: effa4c75b4970c1d87b2d1b0d83ae1f5e8312b0b
Parents: 5adc778
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Fri Jan 10 18:12:46 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Fri Jan 10 18:12:46 2014 -0700

----------------------------------------------------------------------
 utils/src/com/cloud/utils/UriUtils.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/effa4c75/utils/src/com/cloud/utils/UriUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/UriUtils.java b/utils/src/com/cloud/utils/UriUtils.java
index 4f9db85..1d5a513 100644
--- a/utils/src/com/cloud/utils/UriUtils.java
+++ b/utils/src/com/cloud/utils/UriUtils.java
@@ -147,6 +147,8 @@ public class UriUtils {
             URI uri = new URI(url);
             if (uri.getScheme().equalsIgnoreCase("http")) {
                 httpConn = (HttpURLConnection)uri.toURL().openConnection();
+                httpConn.setConnectTimeout(2000);
+                httpConn.setReadTimeout(5000);
                 if (httpConn != null) {
                     String contentLength = httpConn.getHeaderField("content-length");
                     if (contentLength != null) {


Mime
View raw message