Skip to content

Commit aea9851

Browse files
shwstpprshwstppr
committed
FR568 - VR migration between clusters (#28)
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> ui: fix UI label bug #28 (#34) Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> fix system vm migration with zone wide storage (#35) * fix system vm migration with zone wide storage Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> * fix Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> * fix spacing Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> * add empty volumes check Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> fix fr568 issue #28 (#36) Fixes systemvm migration with zone-wide storage Check only for usable volumes Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> vmware: fix error msg for vmotion without shared storage (#37) Fixes error message which wrongly mentions worker VM Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> refactor error message for interpod systemvm migration (#38) Fixes error message introduced in #28 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 7a950cb commit aea9851

File tree

9 files changed

+816
-69
lines changed

9 files changed

+816
-69
lines changed

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

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.command.admin.systemvm;
1818

19-
import org.apache.log4j.Logger;
19+
import java.util.HashMap;
2020

2121
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
2222
import org.apache.cloudstack.api.ACL;
@@ -27,8 +27,10 @@
2727
import org.apache.cloudstack.api.Parameter;
2828
import org.apache.cloudstack.api.ServerApiException;
2929
import org.apache.cloudstack.api.response.HostResponse;
30+
import org.apache.cloudstack.api.response.StoragePoolResponse;
3031
import org.apache.cloudstack.api.response.SystemVmResponse;
3132
import org.apache.cloudstack.context.CallContext;
33+
import org.apache.log4j.Logger;
3234

3335
import com.cloud.event.EventTypes;
3436
import com.cloud.exception.ConcurrentOperationException;
@@ -37,6 +39,7 @@
3739
import com.cloud.exception.ResourceUnavailableException;
3840
import com.cloud.exception.VirtualMachineMigrationException;
3941
import com.cloud.host.Host;
42+
import com.cloud.storage.StoragePool;
4043
import com.cloud.user.Account;
4144
import com.cloud.vm.VirtualMachine;
4245

@@ -54,7 +57,6 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
5457
@Parameter(name = ApiConstants.HOST_ID,
5558
type = CommandType.UUID,
5659
entityType = HostResponse.class,
57-
required = true,
5860
description = "destination Host ID to migrate VM to")
5961
private Long hostId;
6062

@@ -66,6 +68,13 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
6668
description = "the ID of the virtual machine")
6769
private Long virtualMachineId;
6870

71+
@Parameter(name = ApiConstants.STORAGE_ID,
72+
since = "4.16.0",
73+
type = CommandType.UUID,
74+
entityType = StoragePoolResponse.class,
75+
description = "Destination storage pool ID to migrate VM volumes to. Required for migrating the root disk volume")
76+
private Long storageId;
77+
6978
/////////////////////////////////////////////////////
7079
/////////////////// Accessors ///////////////////////
7180
/////////////////////////////////////////////////////
@@ -78,6 +87,10 @@ public Long getVirtualMachineId() {
7887
return virtualMachineId;
7988
}
8089

90+
public Long getStoragePoolId() {
91+
return storageId;
92+
}
93+
8194
/////////////////////////////////////////////////////
8295
/////////////// API Implementation///////////////////
8396
/////////////////////////////////////////////////////
@@ -109,15 +122,43 @@ public String getEventDescription() {
109122

110123
@Override
111124
public void execute() {
125+
if (getHostId() == null && getStoragePoolId() == null) {
126+
throw new InvalidParameterValueException("Either hostId or storageId must be specified");
127+
}
112128

113-
Host destinationHost = _resourceService.getHost(getHostId());
114-
if (destinationHost == null) {
115-
throw new InvalidParameterValueException("Unable to find the host to migrate the VM, host id=" + getHostId());
129+
if (getHostId() != null && getStoragePoolId() != null) {
130+
throw new InvalidParameterValueException("Only one of hostId and storageId can be specified");
116131
}
117-
try {
132+
133+
Host destinationHost = null;
134+
if (getHostId() != null) {
135+
destinationHost = _resourceService.getHost(getHostId());
136+
if (destinationHost == null) {
137+
throw new InvalidParameterValueException("Unable to find the host to migrate the VM, host id=" + getHostId());
138+
}
139+
if (destinationHost.getType() != Host.Type.Routing) {
140+
throw new InvalidParameterValueException("The specified host(" + destinationHost.getName() + ") is not suitable to migrate the VM, please specify another one");
141+
}
118142
CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " to host Id: " + getHostId());
143+
}
144+
145+
// OfflineMigration performed when this parameter is specified
146+
StoragePool destStoragePool = null;
147+
if (getStoragePoolId() != null) {
148+
destStoragePool = _storageService.getStoragePool(getStoragePoolId());
149+
if (destStoragePool == null) {
150+
throw new InvalidParameterValueException("Unable to find the storage pool to migrate the VM");
151+
}
152+
CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " to storage pool Id: " + getStoragePoolId());
153+
}
154+
try {
119155
//FIXME : Should not be calling UserVmService to migrate all types of VMs - need a generic VM layer
120-
VirtualMachine migratedVm = _userVmService.migrateVirtualMachine(getVirtualMachineId(), destinationHost);
156+
VirtualMachine migratedVm = null;
157+
if (getHostId() != null) {
158+
migratedVm = _userVmService.migrateVirtualMachineWithVolume(getVirtualMachineId(), destinationHost, new HashMap<String, String>());
159+
} else if (getStoragePoolId() != null) {
160+
migratedVm = _userVmService.vmStorageMigration(getVirtualMachineId(), destStoragePool);
161+
}
121162
if (migratedVm != null) {
122163
// return the generic system VM instance response
123164
SystemVmResponse response = _responseGenerator.createSystemVmResponse(migratedVm);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2741,7 +2741,7 @@ private void orchestrateMigrateWithStorage(final String vmUuid, final long srcHo
27412741
Nic defaultNic = _networkModel.getDefaultNic(vm.getId());
27422742

27432743
List<String[]> vmData = null;
2744-
if (defaultNic != null) {
2744+
if (defaultNic != null && VirtualMachine.Type.User.equals(vm.getType())) {
27452745
UserVmVO userVm = _userVmDao.findById(vm.getId());
27462746
Map<String, String> details = _vmDetailsDao.listDetailsKeyPairs(vm.getId());
27472747
userVm.setDetails(details);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ public List<Command> finalizeMigrate(VirtualMachine vm, Map<Volume, StoragePool>
705705
hostInTargetCluster = hosts.get(0);
706706
}
707707
if (hostInTargetCluster == null) {
708-
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");
708+
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");
709709
}
710710
}
711711
MigrateVmToPoolCommand migrateVmToPoolCommand = new MigrateVmToPoolCommand(vm.getInstanceName(),

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@
292292
import com.cloud.uservm.UserVm;
293293
import com.cloud.utils.EnumUtils;
294294
import com.cloud.utils.Pair;
295+
import com.cloud.utils.StringUtils;
295296
import com.cloud.vm.ConsoleProxyVO;
296297
import com.cloud.vm.DomainRouterVO;
297298
import com.cloud.vm.InstanceGroup;
@@ -1666,7 +1667,17 @@ public static String findJobInstanceUuid(AsyncJob job) {
16661667
///////////////////////////////////////////////////////////////////////
16671668

16681669
public static DomainRouterResponse newDomainRouterResponse(DomainRouterJoinVO vr, Account caller) {
1669-
return s_domainRouterJoinDao.newDomainRouterResponse(vr, caller);
1670+
DomainRouterResponse response = s_domainRouterJoinDao.newDomainRouterResponse(vr, caller);
1671+
if (StringUtils.isBlank(response.getHypervisor())) {
1672+
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(vr.getId());
1673+
if (vm.getLastHostId() != null) {
1674+
HostVO lastHost = ApiDBUtils.findHostById(vm.getLastHostId());
1675+
if (lastHost != null) {
1676+
response.setHypervisor(lastHost.getHypervisorType().toString());
1677+
}
1678+
}
1679+
}
1680+
return response;
16701681
}
16711682

16721683
public static DomainRouterResponse fillRouterDetails(DomainRouterResponse vrData, DomainRouterJoinVO vr) {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,11 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
13441344
vmResponse.setHostName(host.getName());
13451345
vmResponse.setHypervisor(host.getHypervisorType().toString());
13461346
}
1347+
} else if (vm.getLastHostId() != null) {
1348+
Host lastHost = ApiDBUtils.findHostById(vm.getLastHostId());
1349+
if (lastHost != null) {
1350+
vmResponse.setHypervisor(lastHost.getHypervisorType().toString());
1351+
}
13471352
}
13481353

13491354
if (vm.getState() != null) {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ public Pair<List<? extends Host>, Integer> searchForServers(final ListHostsCmd c
11941194
// Check if the vm can be migrated with storage.
11951195
boolean canMigrateWithStorage = false;
11961196

1197-
if (vm.getType() == VirtualMachine.Type.User) {
1197+
if (VirtualMachine.Type.User.equals(vm.getType()) || HypervisorType.VMware.equals(vm.getHypervisorType())) {
11981198
canMigrateWithStorage = Boolean.TRUE.equals(_hypervisorCapabilitiesDao.isStorageMotionSupported(srcHost.getHypervisorType(), srcHostVersion));
11991199
}
12001200

@@ -1221,7 +1221,8 @@ public Pair<List<? extends Host>, Integer> searchForServers(final ListHostsCmd c
12211221
final Map<Host, Boolean> requiresStorageMotion = new HashMap<Host, Boolean>();
12221222
DataCenterDeployment plan = null;
12231223
if (canMigrateWithStorage) {
1224-
allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), null, null, null, null, null, null,
1224+
Long podId = !VirtualMachine.Type.User.equals(vm.getType()) ? srcHost.getPodId() : null;
1225+
allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), podId, null, null, null, null, null,
12251226
srcHost.getHypervisorType(), null);
12261227
allHosts = allHostsPair.first();
12271228
allHosts.remove(srcHost);
@@ -1262,7 +1263,7 @@ public Pair<List<? extends Host>, Integer> searchForServers(final ListHostsCmd c
12621263
}
12631264
}
12641265

1265-
plan = new DataCenterDeployment(srcHost.getDataCenterId(), null, null, null, null, null);
1266+
plan = new DataCenterDeployment(srcHost.getDataCenterId(), podId, null, null, null, null);
12661267
} else {
12671268
final Long cluster = srcHost.getClusterId();
12681269
if (s_logger.isDebugEnabled()) {

0 commit comments

Comments
 (0)