You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/02/14 08:44:10 UTC
git commit: updated refs/heads/4.3-forward to 76e019f
Updated Branches:
refs/heads/4.3-forward 40d069a6e -> 76e019f71
CLOUDSTACK-6103: Pass VM iso information along with
PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76e019f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76e019f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76e019f7
Branch: refs/heads/4.3-forward
Commit: 76e019f717ca27f5124aebc9db3c5d807bb72868
Parents: 40d069a
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Fri Feb 14 00:43:23 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Fri Feb 14 00:43:58 2014 -0700
----------------------------------------------------------------------
.../src/com/cloud/template/TemplateManager.java | 9 ++++-
.../orchestration/VolumeOrchestrator.java | 10 +++---
.../kvm/resource/LibvirtComputingResource.java | 6 +++-
.../com/cloud/template/TemplateManagerImpl.java | 35 ++++++++++++++++++++
server/src/com/cloud/vm/UserVmManagerImpl.java | 31 ++---------------
5 files changed, 56 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e019f7/engine/components-api/src/com/cloud/template/TemplateManager.java
----------------------------------------------------------------------
diff --git a/engine/components-api/src/com/cloud/template/TemplateManager.java b/engine/components-api/src/com/cloud/template/TemplateManager.java
index 3adce4f..13b0cdf 100755
--- a/engine/components-api/src/com/cloud/template/TemplateManager.java
+++ b/engine/components-api/src/com/cloud/template/TemplateManager.java
@@ -32,6 +32,7 @@ import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStoragePoolVO;
import com.cloud.storage.VMTemplateVO;
import com.cloud.utils.Pair;
+import com.cloud.vm.VirtualMachineProfile;
/**
* TemplateManager manages the templates stored on secondary storage. It is responsible for creating private/public templates.
@@ -115,7 +116,13 @@ public interface TemplateManager {
TemplateInfo prepareIso(long isoId, long dcId);
-
+
+ /**
+ * Adds ISO definition to given vm profile
+ *
+ * @param VirtualMachineProfile
+ */
+ void prepareIsoForVmProfile(VirtualMachineProfile profile);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e019f7/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index a3ab5a4..2f181ab 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -1017,10 +1017,12 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
vm.addDisk(disk);
}
- if (vm.getType() == VirtualMachine.Type.User && vm.getTemplate().getFormat() == ImageFormat.ISO) {
- DataTO dataTO = tmplFactory.getTemplate(vm.getTemplate().getId(), DataStoreRole.Image, vm.getVirtualMachine().getDataCenterId()).getTO();
- DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO);
- vm.addDisk(iso);
+ //if (vm.getType() == VirtualMachine.Type.User && vm.getTemplate().getFormat() == ImageFormat.ISO) {
+ if (vm.getType() == VirtualMachine.Type.User) {
+ _tmpltMgr.prepareIsoForVmProfile(vm);
+ //DataTO dataTO = tmplFactory.getTemplate(vm.getTemplate().getId(), DataStoreRole.Image, vm.getVirtualMachine().getDataCenterId()).getTO();
+ //DiskTO iso = new DiskTO(dataTO, 3L, null, Volume.Type.ISO);
+ //vm.addDisk(iso);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e019f7/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 6e0c6fa..34770e4 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2956,6 +2956,7 @@ ServerResource {
}
List<InterfaceDef> ifaces = null;
+ List<DiskDef> disks = null;
Domain dm = null;
Connect dconn = null;
@@ -2965,6 +2966,7 @@ ServerResource {
try {
conn = LibvirtConnection.getConnectionByVmName(cmd.getVmName());
ifaces = getInterfaces(conn, vmName);
+ disks = getDisks(conn, vmName);
dm = conn.domainLookupByName(vmName);
/*
We replace the private IP address with the address of the destination host.
@@ -2990,7 +2992,9 @@ ServerResource {
destDomain = dm.migrate(dconn, (1 << 0) | (1 << 3), xmlDesc, vmName, "tcp:"
+ cmd.getDestinationIp(), _migrateSpeed);
- _storagePoolMgr.disconnectPhysicalDisksViaVmSpec(cmd.getVirtualMachine());
+ for (DiskDef disk : disks) {
+ cleanupDisk(disk);
+ }
} catch (LibvirtException e) {
s_logger.debug("Can't migrate domain: " + e.getMessage());
result = e.getMessage();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e019f7/server/src/com/cloud/template/TemplateManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 3bfe5c8..b8a7a5f 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -83,6 +83,7 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
+import org.apache.cloudstack.storage.to.TemplateObjectTO;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -159,6 +160,7 @@ import com.cloud.storage.download.DownloadMonitor;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.storage.upload.UploadMonitor;
import com.cloud.template.TemplateAdapter.TemplateAdapterType;
+import com.cloud.template.VirtualMachineTemplate.BootloaderType;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountService;
@@ -184,6 +186,7 @@ import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
@@ -492,6 +495,38 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
return tmpltStore.createEntityExtractUrl(templateObject.getInstallPath(), template.getFormat(), templateObject);
}
+ @Override
+ public void prepareIsoForVmProfile(VirtualMachineProfile profile) {
+ UserVmVO vm = _userVmDao.findById(profile.getId());
+ if (vm.getIsoId() != null) {
+ TemplateInfo template = prepareIso(vm.getIsoId(), vm.getDataCenterId());
+ if (template == null){
+ s_logger.error("Failed to prepare ISO on secondary or cache storage");
+ throw new CloudRuntimeException("Failed to prepare ISO on secondary or cache storage");
+ }
+ if (template.isBootable()) {
+ profile.setBootLoaderType(BootloaderType.CD);
+ }
+
+ GuestOSVO guestOS = _guestOSDao.findById(template.getGuestOSId());
+ String displayName = null;
+ if (guestOS != null) {
+ displayName = guestOS.getDisplayName();
+ }
+
+ TemplateObjectTO iso = (TemplateObjectTO)template.getTO();
+ iso.setGuestOsType(displayName);
+ DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
+ profile.addDisk(disk);
+ } else {
+ TemplateObjectTO iso = new TemplateObjectTO();
+ iso.setFormat(ImageFormat.ISO);
+ DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
+ profile.addDisk(disk);
+ }
+
+ }
+
public void prepareTemplateInAllStoragePools(final VMTemplateVO template, long zoneId) {
List<StoragePoolVO> pools = _poolDao.listByStatus(StoragePoolStatus.Up);
for (final StoragePoolVO pool : pools) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76e019f7/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 81be19f..7cf4a24 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -412,7 +412,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
@Inject
VpcManager _vpcMgr;
@Inject
- TemplateManager templateMgr;
+ TemplateManager _templateMgr;
@Inject
protected GuestOSCategoryDao _guestOSCategoryDao;
@Inject
@@ -3182,34 +3182,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
UserVmVO vm = _vmDao.findById(profile.getId());
Map<String, String> details = _vmDetailsDao.listDetailsKeyPairs(vm.getId());
vm.setDetails(details);
-
- if (vm.getIsoId() != null) {
- TemplateInfo template = templateMgr.prepareIso(vm.getIsoId(), vm.getDataCenterId());
- if (template == null){
- s_logger.error("Failed to prepare ISO on secondary or cache storage");
- throw new CloudRuntimeException("Failed to prepare ISO on secondary or cache storage");
- }
- if (template.isBootable()) {
- profile.setBootLoaderType(BootloaderType.CD);
- }
-
- GuestOSVO guestOS = _guestOSDao.findById(template.getGuestOSId());
- String displayName = null;
- if (guestOS != null) {
- displayName = guestOS.getDisplayName();
- }
-
- TemplateObjectTO iso = (TemplateObjectTO)template.getTO();
- iso.setGuestOsType(displayName);
- DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
- profile.addDisk(disk);
- } else {
- TemplateObjectTO iso = new TemplateObjectTO();
- iso.setFormat(ImageFormat.ISO);
- DiskTO disk = new DiskTO(iso, 3L, null, Volume.Type.ISO);
- profile.addDisk(disk);
- }
-
+ _templateMgr.prepareIsoForVmProfile(profile);
return true;
}