FR568 - VR migration between clusters (#28)

Signed-off-by: Abhishek Kumar <[email protected]>

ui: fix UI label bug #28 (#34)

Signed-off-by: Abhishek Kumar <[email protected]>

fix system vm migration with zone wide storage (#35)

* fix system vm migration with zone wide storage

Signed-off-by: Abhishek Kumar <[email protected]>

* fix

Signed-off-by: Abhishek Kumar <[email protected]>

* fix spacing

Signed-off-by: Abhishek Kumar <[email protected]>

* add empty volumes check

Signed-off-by: Abhishek Kumar <[email protected]>

fix fr568 issue #28 (#36)

Fixes systemvm migration with zone-wide storage
Check only for usable volumes

Signed-off-by: Abhishek Kumar <[email protected]>

vmware: fix error msg for vmotion without shared storage (#37)

Fixes error message which wrongly mentions worker VM

Signed-off-by: Abhishek Kumar <[email protected]>

refactor error message for interpod systemvm migration (#38)

Fixes error message introduced in #28

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java

@@ -16,7 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.systemvm;
 
-import org.apache.log4j.Logger;
+import java.util.HashMap;
 
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.ACL;
@@ -27,8 +27,10 @@
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.SystemVmResponse;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
 
 import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
@@ -37,6 +39,7 @@
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.exception.VirtualMachineMigrationException;
 import com.cloud.host.Host;
+import com.cloud.storage.StoragePool;
 import com.cloud.user.Account;
 import com.cloud.vm.VirtualMachine;
 
@@ -54,7 +57,6 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.HOST_ID,
                type = CommandType.UUID,
                entityType = HostResponse.class,
-               required = true,
                description = "destination Host ID to migrate VM to")
     private Long hostId;
 
@@ -66,6 +68,13 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
                description = "the ID of the virtual machine")
     private Long virtualMachineId;
 
+    @Parameter(name = ApiConstants.STORAGE_ID,
+            since = "4.16.0",
+            type = CommandType.UUID,
+            entityType = StoragePoolResponse.class,
+            description = "Destination storage pool ID to migrate VM volumes to. Required for migrating the root disk volume")
+    private Long storageId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -78,6 +87,10 @@ public Long getVirtualMachineId() {
         return virtualMachineId;
     }
 
+    public Long getStoragePoolId() {
+        return storageId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -109,15 +122,43 @@ public String getEventDescription() {
 
     @Override
     public void execute() {
+        if (getHostId() == null && getStoragePoolId() == null) {
+            throw new InvalidParameterValueException("Either hostId or storageId must be specified");
+        }
 
-        Host destinationHost = _resourceService.getHost(getHostId());
-        if (destinationHost == null) {
-            throw new InvalidParameterValueException("Unable to find the host to migrate the VM, host id=" + getHostId());
+        if (getHostId() != null && getStoragePoolId() != null) {
+            throw new InvalidParameterValueException("Only one of hostId and storageId can be specified");
         }
-        try {
+
+        Host destinationHost = null;
+        if (getHostId() != null) {
+            destinationHost = _resourceService.getHost(getHostId());
+            if (destinationHost == null) {
+                throw new InvalidParameterValueException("Unable to find the host to migrate the VM, host id=" + getHostId());
+            }
+            if (destinationHost.getType() != Host.Type.Routing) {
+                throw new InvalidParameterValueException("The specified host(" + destinationHost.getName() + ") is not suitable to migrate the VM, please specify another one");
+            }
             CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " to host Id: " + getHostId());
+        }
+
+        // OfflineMigration performed when this parameter is specified
+        StoragePool destStoragePool = null;
+        if (getStoragePoolId() != null) {
+            destStoragePool = _storageService.getStoragePool(getStoragePoolId());
+            if (destStoragePool == null) {
+                throw new InvalidParameterValueException("Unable to find the storage pool to migrate the VM");
+            }
+            CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " to storage pool Id: " + getStoragePoolId());
+        }
+        try {
             //FIXME : Should not be calling UserVmService to migrate all types of VMs - need a generic VM layer
-            VirtualMachine migratedVm = _userVmService.migrateVirtualMachine(getVirtualMachineId(), destinationHost);
+            VirtualMachine migratedVm = null;
+            if (getHostId() != null) {
+                migratedVm = _userVmService.migrateVirtualMachineWithVolume(getVirtualMachineId(), destinationHost, new HashMap<String, String>());
+            } else if (getStoragePoolId() != null) {
+                migratedVm = _userVmService.vmStorageMigration(getVirtualMachineId(), destStoragePool);
+            }
             if (migratedVm != null) {
                 // return the generic system VM instance response
                 SystemVmResponse response = _responseGenerator.createSystemVmResponse(migratedVm);

client/WEB-INF/classes/resources/messages.properties

@@ -247,8 +247,10 @@ label.action.migrate.instance.processing=Migrating Instance....
 label.action.migrate.instance=Migrate Instance
 label.action.migrate.router.processing=Migrating Router....
 label.action.migrate.router=Migrate Router
+label.action.migrate.router.to.ps=Migrate router to another primary storage
 label.action.migrate.systemvm.processing=Migrating System VM....
 label.action.migrate.systemvm=Migrate System VM
+label.action.migrate.systemvm.to.ps=Migrate system VM to another primary storage
 label.action.reboot.instance.processing=Rebooting Instance....
 label.action.reboot.instance=Reboot Instance
 label.action.reboot.router.processing=Rebooting Router....
@@ -1532,6 +1534,7 @@ label.virtual.appliance.details=Virtual applicance details
 label.start.lb.vm=Start LB VM
 label.stop.lb.vm=Stop LB VM
 label.migrate.lb.vm=Migrate LB VM
+label.migrate.lb.vm.to.ps=Migrate LB VM to another primary storage
 label.vpc.virtual.router=VPC Virtual Router
 label.ovs=OVS
 label.gslb.service=GSLB service
@@ -1998,6 +2001,9 @@ message.lock.account=Please confirm that you want to lock this account.  By lock
 message.migrate.instance.confirm=Please confirm the host you wish to migrate the virtual instance to.
 message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
 message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
+message.migrate.lb.vm.to.ps=Please confirm that you want to migrate LB VM to another primary storage.
+message.migrate.router.to.ps=Please confirm that you want to migrate router to another primary storage.
+message.migrate.system.vm.to.ps=Please confirm that you want to migrate system VM to another primary storage.
 message.migrate.router.confirm=Please confirm the host you wish to migrate the router to\:
 message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to\:
 message.migrate.volume=Please confirm that you want to migrate volume to another primary storage.

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2491,7 +2491,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
             Nic defaultNic = _networkModel.getDefaultNic(vm.getId());
 
             List<String[]> vmData = null;
-            if (defaultNic != null) {
+            if (defaultNic != null && VirtualMachine.Type.User.equals(vm.getType())) {
                 UserVmVO userVm = _userVmDao.findById(vm.getId());
                 Map<String, String> details = _vmDetailsDao.listDetailsKeyPairs(vm.getId());
                 vm.setDetails(details);

plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java

@@ -639,7 +639,7 @@ public List<Command> finalizeMigrate(VirtualMachine vm, Map<Volume, StoragePool>
                 hostInTargetCluster = hosts.get(0);
             }
             if (hostInTargetCluster == null) {
-                throw new CloudRuntimeException("Migration failed, unable to find suitable target host for worker VM placement while migrating between storage pools of different clusters without shared storages");
+                throw new CloudRuntimeException("Migration failed, unable to find suitable target host for VM placement while migrating between storage pools of different clusters without shared storages");
             }
         }
         MigrateVmToPoolCommand migrateVmToPoolCommand = new MigrateVmToPoolCommand(vm.getInstanceName(),

server/src/com/cloud/api/ApiDBUtils.java

@@ -291,6 +291,7 @@
 import com.cloud.utils.EnumUtils;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
 import com.cloud.vm.ConsoleProxyVO;
 import com.cloud.vm.DomainRouterVO;
 import com.cloud.vm.InstanceGroup;
@@ -1628,7 +1629,17 @@ public static String findJobInstanceUuid(AsyncJob job) {
     ///////////////////////////////////////////////////////////////////////
 
     public static DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO vr, Account caller) {
-        return s_domainRouterJoinDao.newDomainRouterResponse(vr, caller);
+        DomainRouterResponse response = s_domainRouterJoinDao.newDomainRouterResponse(vr, caller);
+        if (StringUtils.isBlank(response.getHypervisor())) {
+            VMInstanceVO vm = ApiDBUtils.findVMInstanceById(vr.getId());
+            if (vm.getLastHostId() != null) {
+                HostVO lastHost = ApiDBUtils.findHostById(vm.getLastHostId());
+                if (lastHost != null) {
+                    response.setHypervisor(lastHost.getHypervisorType().toString());
+                }
+            }
+        }
+        return  response;
     }
 
     public static DomainRouterResponse fillRouterDetails(DomainRouterResponse vrData, DomainRouterJoinVO vr) {

server/src/com/cloud/api/ApiResponseHelper.java

@@ -1264,6 +1264,11 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
                     vmResponse.setHostName(host.getName());
                     vmResponse.setHypervisor(host.getHypervisorType().toString());
                 }
+            } else if (vm.getLastHostId() != null) {
+                Host lastHost = ApiDBUtils.findHostById(vm.getLastHostId());
+                if (lastHost != null) {
+                    vmResponse.setHypervisor(lastHost.getHypervisorType().toString());
+                }
             }
 
             if (vm.getState() != null) {

server/src/com/cloud/server/ManagementServerImpl.java

@@ -1176,7 +1176,7 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
         // Check if the vm can be migrated with storage.
         boolean canMigrateWithStorage = false;
 
-        if (vm.getType() == VirtualMachine.Type.User) {
+        if (VirtualMachine.Type.User.equals(vm.getType()) || HypervisorType.VMware.equals(vm.getHypervisorType())) {
             canMigrateWithStorage = Boolean.TRUE.equals(_hypervisorCapabilitiesDao.isStorageMotionSupported(srcHost.getHypervisorType(), srcHostVersion));
         }
 
@@ -1204,7 +1204,8 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
         DataCenterDeployment plan = null;
 
         if (canMigrateWithStorage) {
-            allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), null, null, null, null, null, null,
+            Long podId = !VirtualMachine.Type.User.equals(vm.getType()) ? srcHost.getPodId() : null;
+            allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), podId, null, null, null, null, null,
                     srcHost.getHypervisorType(), null);
             allHosts = allHostsPair.first();
             allHosts.remove(srcHost);
@@ -1233,7 +1234,7 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
                     }
                 }
             }
-            plan = new DataCenterDeployment(srcHost.getDataCenterId(), null, null, null, null, null);
+            plan = new DataCenterDeployment(srcHost.getDataCenterId(), podId, null, null, null, null);
         } else {
             final Long cluster = srcHost.getClusterId();
             if (s_logger.isDebugEnabled()) {