etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.15' into main

This commit is contained in:
nicolas 2021-08-30 22:32:27 -03:00
parent fc213ac9fd e50a40ea08
commit 3ddcf85876
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -2638,7 +2638,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
s_logger.debug("Mapping spec disks information to cloned VM disks for VM " + vmInternalCSName);
if (vmMo != null && ArrayUtils.isNotEmpty(specDisks)) {
List<VirtualDisk> vmDisks = vmMo.getVirtualDisks();
List<VirtualDisk> vmDisks = vmMo.getVirtualDisksOrderedByKey();
List<VirtualDisk> rootDisks = new ArrayList<>();
List<DiskTO> sortedRootDisksFromSpec = Arrays.asList(sortVolumesByDeviceId(specDisks))
.stream()

16
plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
View File

@ -1252,20 +1252,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
vmMo.createFullCloneWithSpecificDisk(templateUniqueName, dcMo.getVmFolder(), morPool, VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first()), volumeDeviceInfo);
clonedVm = dcMo.findVm(templateUniqueName);
/* FR41 THIS IS OLD way of creating template using snapshot
if (!vmMo.createSnapshot(templateUniqueName, "Temporary snapshot for template creation", false, false)) {
String msg = "Unable to take snapshot for creating template from volume. volume path: " + volumePath;
s_logger.error(msg);
throw new Exception(msg);
}
String hardwareVersion = String.valueOf(vmMo.getVirtualHardwareVersion());
// 4 MB is the minimum requirement for VM memory in VMware
Pair<VirtualMachineMO, String[]> cloneResult =
vmMo.cloneFromCurrentSnapshot(workerVmName, 0, 4, volumeDeviceInfo.second(), VmwareHelper.getDiskDeviceDatastore(volumeDeviceInfo.first()), hardwareVersion);
clonedVm = cloneResult.first();
* */
clonedVm.tagAsWorkerVM();
clonedVm.exportVm(secondaryMountPoint + "/" + installPath, templateUniqueName, false, false);
// Get VMDK filename
@ -1858,6 +1845,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
s_logger.error(msg);
throw new Exception(msg);
}
clonedVm.tagAsWorkerVM();
vmMo = clonedVm;
}
vmMo.exportVm(exportPath, exportName, false, false);

4
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
View File

@ -1727,9 +1727,7 @@ public class HypervisorHostHelper {
}
if (workingVM != null) {
workingVM.setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER, "true");
String workerTag = String.format("%d-%s", System.currentTimeMillis(), hyperHost.getContext().getStockObject("noderuninfo"));
workingVM.setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER_TAG, workerTag);
workingVM.tagAsWorkerVM();
}
return workingVM;
}

20
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -2825,6 +2825,20 @@ public class VirtualMachineMO extends BaseMO {
return virtualDisks;
}
public List<VirtualDisk> getVirtualDisksOrderedByKey() throws Exception {
List<VirtualDisk> virtualDisks = getVirtualDisks();
Collections.sort(virtualDisks, new Comparator<VirtualDisk>() {
@Override
public int compare(VirtualDisk disk1, VirtualDisk disk2) {
Integer disk1Key = disk1.getKey();
Integer disk2Key = disk2.getKey();
return disk1Key.compareTo(disk2Key);
}
});
return virtualDisks;
}
public List<String> detachAllDisksExcept(String vmdkBaseName, String deviceBusName) throws Exception {
List<VirtualDevice> devices = _context.getVimClient().getDynamicProperty(_mor, "config.hardware.device");
@ -3593,4 +3607,10 @@ public class VirtualMachineMO extends BaseMO {
VirtualMachineTicket ticket = _context.getService().acquireTicket(_mor, "webmks");
return ticket.getTicket();
}
public void tagAsWorkerVM() throws Exception {
setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER, "true");
String workerTag = String.format("%d-%s", System.currentTimeMillis(), getContext().getStockObject("noderuninfo"));
setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER_TAG, workerTag);
}
}