You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2026/07/10 12:42:09 UTC
(cloudstack) branch main updated (4d54125bb62 -> 846803db076)
This is an automated email from the ASF dual-hosted git repository.
weizhouapache pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 4d54125bb62 CLVM: Fix volume mapping and disk path matching for storage migration (#13468)
add 57671274d86 linstor: fix encrypted volume snapshot backup and restore (#13486)
add ff9ee24d125 Fix local upload from browser failing due to ssvm cert not trusted (#13204)
add b642bbe38e1 Fix the validation of CPVMs states in multiple zones (#13021)
add 357186d64d0 flasharray: fall back to array capacity when pod has no quota (#13050)
add a3970bb1530 Fix convert command's timeout for snapshot commands (#13210)
add 7bc458ff85e Fix for usage server getting stuck due to duplicate VM events (#13019)
add d35c1cd3ffe Remove the duplicate configkey json.content.type (#13264)
add 0bbea200626 server: fix NPE when migrate vm away with volumes (#13131)
add b26b70c40d6 Fix public IP range addition form (#13356)
add 4244c2cc102 UI: Allow selecting network for VNF nics if template is a non deploy-as-is template (#13423)
add 78d9cb5abd6 dynamic vm.network.throttling.rate global configuration (#12567)
add b36f06482fa fix misleading error message (#13450)
add 2eb9820f3cb framework-jobs,server: fix password obfuscation for job result and password with display=false (#13388)
add c8b7816d5ee marvin: install mysql-connector-python >= 8.4.0 (#13482)
add a4b102fb3f9 Fix skip DRS for a VM (#12994)
add c7e2c748f74 Merge remote-tracking branch 'apache/4.20' into 4.22
add 265b554d608 Fix 4.22 build failures after forward-merge and rename 42010to42100 to 42040to42100
new 846803db076 Merge remote-tracking branch 'apache/4.22'
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:
.../service/NetworkOrchestrationService.java | 3 +
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 8 +-
...e42020to42030.java => Upgrade42030to42040.java} | 22 +-
...e42010to42100.java => Upgrade42040to42100.java} | 8 +-
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +
.../META-INF/db/schema-42010to42100-cleanup.sql | 20 -
...cleanup.sql => schema-42040to42100-cleanup.sql} | 2 +-
...ma-42010to42100.sql => schema-42040to42100.sql} | 2 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 32 +-
...42100Test.java => Upgrade42040to42100Test.java} | 4 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 38 +-
.../framework/jobs/AsyncJobManagerTest.java | 20 +
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 6 +-
.../adapter/flasharray/FlashArrayAdapter.java | 38 +-
plugins/storage/volume/linstor/CHANGELOG.md | 8 +
.../LinstorBackupSnapshotCommandWrapper.java | 46 ++-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 28 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 14 +-
server/src/main/java/com/cloud/api/ApiServer.java | 8 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 22 +-
.../main/java/com/cloud/configuration/Config.java | 9 -
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 9 +-
.../network/element/VirtualRouterElement.java | 24 +-
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 2 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 34 +-
.../cluster/ClusterDrsServiceImplTest.java | 46 ++-
test/integration/plugins/linstor/README.md | 18 +
.../linstor/test_linstor_encrypted_snapshots.py | 444 +++++++++++++++++++++
ui/public/locales/en.json | 5 +
ui/src/style/vars.less | 2 +-
ui/src/utils/{permissions.js => ssvmProbe.js} | 13 +-
ui/src/views/image/RegisterOrUploadIso.vue | 50 ++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 45 ++-
ui/src/views/infra/network/IpRangesTabPublic.vue | 4 +
ui/src/views/storage/UploadLocalVolume.vue | 133 +++---
40 files changed, 962 insertions(+), 229 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42020to42030.java => Upgrade42030to42040.java} (71%)
rename engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42010to42100.java => Upgrade42040to42100.java} (97%)
delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42010to42100-cleanup.sql
copy engine/schema/src/main/resources/META-INF/db/{schema-41500to41510-cleanup.sql => schema-42040to42100-cleanup.sql} (93%)
rename engine/schema/src/main/resources/META-INF/db/{schema-42010to42100.sql => schema-42040to42100.sql} (99%)
rename engine/schema/src/test/java/com/cloud/upgrade/dao/{Upgrade42010to42100Test.java => Upgrade42040to42100Test.java} (98%)
create mode 100644 test/integration/plugins/linstor/test_linstor_encrypted_snapshots.py
copy ui/src/utils/{permissions.js => ssvmProbe.js} (69%)
(cloudstack) 01/01: Merge remote-tracking branch 'apache/4.22'
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weizhouapache pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 846803db0766e95e618d0675186268c4d31fefb0
Merge: 4d54125bb62 265b554d608
Author: Wei Zhou <we...@apache.org>
AuthorDate: Fri Jul 10 14:40:24 2026 +0200
Merge remote-tracking branch 'apache/4.22'
.../service/NetworkOrchestrationService.java | 3 +
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade42030to42040.java | 58 +++
...e42010to42100.java => Upgrade42040to42100.java} | 8 +-
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +
...cleanup.sql => schema-42040to42100-cleanup.sql} | 2 +-
...ma-42010to42100.sql => schema-42040to42100.sql} | 2 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 32 +-
...42100Test.java => Upgrade42040to42100Test.java} | 4 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 38 +-
.../framework/jobs/AsyncJobManagerTest.java | 20 +
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 6 +-
.../adapter/flasharray/FlashArrayAdapter.java | 38 +-
plugins/storage/volume/linstor/CHANGELOG.md | 8 +
.../LinstorBackupSnapshotCommandWrapper.java | 46 ++-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 28 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 14 +-
server/src/main/java/com/cloud/api/ApiServer.java | 8 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 22 +-
.../main/java/com/cloud/configuration/Config.java | 9 -
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 9 +-
.../network/element/VirtualRouterElement.java | 24 +-
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 2 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 34 +-
.../cluster/ClusterDrsServiceImplTest.java | 46 ++-
test/integration/plugins/linstor/README.md | 18 +
.../linstor/test_linstor_encrypted_snapshots.py | 444 +++++++++++++++++++++
ui/public/locales/en.json | 5 +
ui/src/style/vars.less | 2 +-
ui/src/utils/ssvmProbe.js | 30 ++
ui/src/views/image/RegisterOrUploadIso.vue | 50 ++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 45 ++-
ui/src/views/infra/network/IpRangesTabPublic.vue | 4 +
ui/src/views/storage/UploadLocalVolume.vue | 133 +++---
39 files changed, 1031 insertions(+), 193 deletions(-)
diff --cc engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index ce5b3f6d094,55079173dc9..15f112c0a36
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@@ -5065,7 -4937,7 +5065,7 @@@ public class NetworkOrchestrator extend
@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[]{NetworkGcWait, NetworkGcInterval, NetworkLockTimeout, DeniedRoutes,
- GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion, DhcpLeaseTimeout,
- GuestDomainSuffix, NetworkThrottlingRate, VmNetworkThrottlingRate, MinVRVersion,
++ GuestDomainSuffix, NetworkThrottlingRate, VmNetworkThrottlingRate, MinVRVersion, DhcpLeaseTimeout,
PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled,
TUNGSTEN_ENABLED, NSX_ENABLED, NETRIS_ENABLED, NETWORK_LB_HAPROXY_MAX_CONN,
NETWORK_LB_HAPROXY_IDLE_TIMEOUT};
diff --cc engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 0e784d961b3,3868ca960e0..c3a982aa70e
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@@ -240,10 -241,11 +242,12 @@@ public class DatabaseUpgradeChecker imp
.next("4.19.0.0", new Upgrade41900to41910())
.next("4.19.1.0", new Upgrade41910to42000())
.next("4.20.0.0", new Upgrade42000to42010())
- .next("4.20.1.0", new Upgrade42010to42100())
+ .next("4.20.2.0", new Upgrade42020to42030())
+ .next("4.20.3.0", new Upgrade42030to42040())
+ .next("4.20.4.0", new Upgrade42040to42100())
.next("4.21.0.0", new Upgrade42100to42200())
.next("4.22.0.0", new Upgrade42200to42210())
+ .next("4.22.1.0", new Upgrade42210to42300())
.build();
}
diff --cc server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index ed3d8558cc5,d662997e392..3c9855ae87a
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@@ -1605,7 -1435,7 +1605,7 @@@ public class BackupManagerImpl extends
accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
if (vm.getBackupOfferingId() != null && !BackupEnableAttachDetachVolumes.value()) {
- throw new CloudRuntimeException("The selected Instance has backups, cannot restore and attach Volume to the Instance.");
- throw new CloudRuntimeException("The selected VM is attached to a backup offering and, thus, it is not possible to restore and attach volumes from backups to the instance.");
++ throw new CloudRuntimeException("The selected Instance is attached to a backup offering and, thus, it is not possible to restore and attach Volumes from backups to the Instance.");
}
if (backup.getZoneId() != vm.getDataCenterId()) {