You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/11/30 15:32:37 UTC
[cloudstack] branch main updated (4abb8b9ebf1 -> 3d8ea4f3b3e)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 4abb8b9ebf1 python command not working in ubuntu 20.04 for apidocs and marvin (#6889)
add 296035d9a57 XenServer/XCP-ng: fix vm memory usage is always 99.9x% (#6852)
add fca5715db13 ui: fix guest traffic vlan input (#6895)
add c8d27765d80 orchestration: fix diskoffering for vr rootdisk (#6853)
add 6c436ec90e2 server: fix domain shared public template check (#6916)
add dbc20320770 server: Check for null poolid (#6879)
add 47946db8883 server: fix volume migration on user vm scale (#6704)
add cf32f77e3de systemvm: Fix C2S VPN in parallel to S2S VPN (#6907)
new 3d8ea4f3b3e Merge remote-tracking branch 'origin/4.17'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/server/ManagementService.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 21 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 20 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 11 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../cloud/tags/TaggedResourceManagerImplTest.java | 7 +
systemvm/debian/opt/cloud/bin/configure.py | 2 +-
test/integration/smoke/test_scale_vm.py | 519 +++++++++++++++++++--
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 3 +-
14 files changed, 539 insertions(+), 72 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.17'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3d8ea4f3b3ee1c009871e00d20ea03087cdc18a0
Merge: 4abb8b9ebf1 cf32f77e3de
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Nov 30 21:02:17 2022 +0530
Merge remote-tracking branch 'origin/4.17'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.../java/com/cloud/server/ManagementService.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 21 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 20 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 11 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
.../cloud/tags/TaggedResourceManagerImplTest.java | 7 +
systemvm/debian/opt/cloud/bin/configure.py | 2 +-
test/integration/smoke/test_scale_vm.py | 519 +++++++++++++++++++--
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 3 +-
14 files changed, 539 insertions(+), 72 deletions(-)
diff --cc server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index f9bf52ea32b,3e17cb75809..3fa4b80a04a
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@@ -2100,16 -2034,16 +2100,23 @@@ public class UserVmManagerImpl extends
if (currentServiceOffering.getDiskOfferingStrictness() && currentServiceOffering.getDiskOfferingId() != newServiceOffering.getDiskOfferingId()) {
throw new InvalidParameterValueException("Unable to Scale VM, since disk offering id associated with the old service offering is not same for new service offering");
}
+
+ DiskOfferingVO currentRootDiskOffering = _diskOfferingDao.findByIdIncludingRemoved(currentServiceOffering.getDiskOfferingId());
+ DiskOfferingVO newRootDiskOffering = _diskOfferingDao.findById(newServiceOffering.getDiskOfferingId());
+
+ if (currentRootDiskOffering.getEncrypt() != newRootDiskOffering.getEncrypt()) {
+ throw new InvalidParameterValueException("Cannot change volume encryption type via service offering change");
+ }
}
- private void changeDiskOfferingForRootVolume(Long vmId, DiskOfferingVO newDiskOffering, Map<String, String> customParameters) throws ResourceAllocationException {
+ private void changeDiskOfferingForRootVolume(Long vmId, DiskOfferingVO newDiskOffering, Map<String, String> customParameters, Long zoneId) throws ResourceAllocationException {
+
+ if (!AllowDiskOfferingChangeDuringScaleVm.valueIn(zoneId)) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug(String.format("Changing the disk offering of the root volume during the compute offering change operation is disabled. Please check the setting [%s].", AllowDiskOfferingChangeDuringScaleVm.key()));
+ }
+ return;
+ }
List<VolumeVO> vols = _volsDao.findReadyAndAllocatedRootVolumesByInstance(vmId);