cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chirad...@apache.org
Subject git commit: updated refs/heads/master to c6e226d
Date Tue, 09 Apr 2013 00:30:42 GMT
Updated Branches:
  refs/heads/master 98bc240d2 -> c6e226da7


CLOUDSTACK-524: in some cases (especially the built-in CentOS template), the template downloader
does not use the configured http proxy
The DownloadProgress command is used to restart failed or stuck download jobs -- and it would
not include the proxy information, unlike the DownloadCommand which always did

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>


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

Branch: refs/heads/master
Commit: c6e226da74e53259c632bce687b12ce05f8408ca
Parents: 98bc240
Author: Chiradeep Vittal <chiradeep@apache.org>
Authored: Mon Apr 8 17:29:54 2013 -0700
Committer: Chiradeep Vittal <chiradeep@apache.org>
Committed: Mon Apr 8 17:29:54 2013 -0700

----------------------------------------------------------------------
 .../storage/download/DownloadMonitorImpl.java      |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6e226da/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index ee8df74..cfb92d5 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -363,10 +363,10 @@ public class DownloadMonitorImpl extends ManagerBase implements  DownloadMonitor
 		    start();
 			DownloadCommand dcmd =
              new DownloadCommand(secUrl, template, maxTemplateSizeInBytes);
-			dcmd.setProxy(getHttpProxy());
 	        if (downloadJobExists) {
 	            dcmd = new DownloadProgressCommand(dcmd, vmTemplateHost.getJobId(), RequestType.GET_OR_RESTART);
 	        }
+            dcmd.setProxy(getHttpProxy());
 			if (vmTemplateHost.isCopy()) {
 				dcmd.setCreds(TemplateConstants.DEFAULT_HTTP_AUTH_USER, _copyAuthPasswd);
 			}
@@ -452,12 +452,11 @@ public class DownloadMonitorImpl extends ManagerBase implements  DownloadMonitor
 		if(volumeHost != null) {
 		    start();
 			DownloadCommand dcmd = new DownloadCommand(secUrl, volume, maxVolumeSizeInBytes, checkSum,
url, format);
-			dcmd.setProxy(getHttpProxy());
 	        if (downloadJobExists) {
 	            dcmd = new DownloadProgressCommand(dcmd, volumeHost.getJobId(), RequestType.GET_OR_RESTART);
 	            dcmd.setResourceType(ResourceType.VOLUME);
 	        }
-			
+            dcmd.setProxy(getHttpProxy());
 			HostVO ssvm = _ssvmMgr.pickSsvmHost(sserver);
 			if( ssvm == null ) {
 	             s_logger.warn("There is no secondary storage VM for secondary storage host
" + sserver.getName());


Mime
View raw message