Updated Branches: refs/heads/master a7b7465be -> 72f896044
bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link Reviewed-by: Kishan Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/72f89604 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/72f89604 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/72f89604 Branch: refs/heads/master Commit: 72f896044d8318f503b3bb5a0a2c9b77bd0129df Parents: a7b7465 Author: Nitin Mehta <[email protected]> Authored: Thu Aug 16 15:40:56 2012 +0530 Committer: Nitin Mehta <[email protected]> Committed: Thu Aug 16 15:53:00 2012 +0530 ---------------------------------------------------------------------- .../src/com/cloud/server/ManagementServerImpl.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/72f89604/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 32ed37d..3873499 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2974,11 +2974,9 @@ public class ManagementServerImpl implements ManagementServer { } long accountId = volume.getAccountId(); - - String secondaryStorageURL = _storageMgr.getSecondaryStorageURL(zoneId); StoragePoolVO srcPool = _poolDao.findById(volume.getPoolId()); - List<HostVO> storageServers = _resourceMgr.listAllHostsInOneZoneByType(Host.Type.SecondaryStorage, zoneId); - HostVO sserver = storageServers.get(0); + HostVO sserver = _storageMgr.getSecondaryStorageHost(zoneId); + String secondaryStorageURL = sserver.getStorageUrl(); List<UploadVO> extractURLList = _uploadDao.listByTypeUploadStatus(volumeId, Upload.Type.VOLUME, UploadVO.Status.DOWNLOAD_URL_CREATED);
