Updated Branches: refs/heads/4.2 e8d00451b -> a21ec81db
Fix build issue. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a21ec81d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a21ec81d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a21ec81d Branch: refs/heads/4.2 Commit: a21ec81db94a31daab26063dd5d137594579de66 Parents: e8d0045 Author: Sateesh Chodapuneedi <[email protected]> Authored: Fri Aug 16 15:58:14 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Fri Aug 16 15:58:14 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a21ec81d/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index b07b3a9..e32cd52 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -131,6 +131,7 @@ import com.cloud.server.ManagementServer; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; +import com.cloud.storage.ScopeType; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; @@ -1448,8 +1449,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } if (fromHost.getClusterId().longValue() != dest.getCluster().getId()) { - s_logger.info("Source and destination host are not in same cluster, unable to migrate to host: " + dest.getHost().getId()); - throw new CloudRuntimeException("Source and destination host are not in same cluster, unable to migrate to host: " + dest.getHost().getId()); // This scenario is valid only if all the volumes of VM being migrated are on zone wide storage pools boolean vmOnZoneWideStoragePool = true; List<VolumeVO> vmVolumes = _volsDao.findUsableVolumesForInstance(vm.getId());
