This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d75acb6efcc Fix rollback disk snapshots on instance snapshot failure
(#12949)
add 37e36577707 [22.0] resource allocation
add 003c8408179 [22.0] resource instance limits
add 8d269cf5bef [22.0] Implement/fix limit validation for projects
add 831ef82ff9b [22.0] resource allocation vpc
add 1f849caa0be [22.0] resource reservation on volume creation
add 46a6bbad270 Fix: KVM Direct Download URL injection (#60)
add 7703fdacab4 [minio] Handle user's canned policy when a bucket is
deleted
add 3d678e726ad [22.0] resource reservation on volume snapshot creation
add d11d182c715 [22.0] Fix resource limit reservation and check during
StartVirtualMachine
add 95816b44e93 extensions: allow reserved resource details
add 4855d40e6e3 [22.0] secondary storage resource limit for download
add 5d5ee7b6893 volume download fix
add d7224151053 [22.0] secondary storage resource limit for upload
add 07c3dc86b2d [22.0] Consider infinite resources when calculating
secondary storage limit for upload operations
add f7f0e751225 Fixed a merge issue in ImageStoreUploadMonitorImpl
add 9c0c8da706e [22.0] Address limit checks for VM, CPU, memory, volume,
and primary storage
add 88a12a801f8 Cleanup imported VM from disk on failure due to volume
allocation + prevent duplicate volume and primary storage increment on import
add c6b20b8cc7f Fix failing tests
add 9db630932e0 Address public IP limit validations
add 8ce1c9876ee fix restore volume from backup and attach
add 24fd440ee72 Fix create VM from backup
add 86c9f7bd941 Fix backup list
add e8d57d1b0dc Implement/fix limit validation for secondary storage
add f3331344566 Address merge issues
add 8608b4edd02 Fix snapshot copy resource limit concurrency
add 19b4ef10693 server: reserve backup, bucket resource limits during
operations
new 1085da4ef8b Merge commit '19b4ef106931aa1d6a8fed06984009d86760e4de'
into 4.22
add d6f4fc3ac40 Updating pom.xml version numbers for release 22.0.1
new 23f633ae835 Merge tag '4.22.0.1' into 4.22
The 2 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:
.../main/java/com/cloud/agent/api/to/BucketTO.java | 7 +
.../java/com/cloud/projects/ProjectService.java | 4 +-
.../storage/VMTemplateStorageResourceAssoc.java | 3 +-
.../java/com/cloud/user/ResourceLimitService.java | 20 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../user/account/AddAccountToProjectCmd.java | 3 +-
.../command/user/account/AddUserToProjectCmd.java | 3 +-
.../RestoreVolumeFromBackupAndAttachToVMCmd.java | 4 +
.../api/command/user/vm/CreateVMFromBackupCmd.java | 1 +
.../cloudstack/api/response/ExtensionResponse.java | 10 +
.../cloudstack/extension/ExtensionHelper.java | 3 +
.../apache/cloudstack/resourcelimit/Reserver.java} | 16 +-
.../command/test/AddAccountToProjectCmdTest.java | 3 +
.../cloud/agent/api/storage/DownloadAnswer.java | 2 +-
.../download/DirectTemplateDownloaderImpl.java | 11 +-
.../download/MetalinkDirectTemplateDownloader.java | 2 +-
.../download/NfsDirectTemplateDownloader.java | 2 +-
.../command/TemplateOrVolumePostUploadCommand.java | 8 +
.../storage/command/UploadStatusCommand.java | 10 +
.../service/NetworkOrchestrationService.java | 2 +-
.../service/VolumeOrchestrationService.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 26 +-
.../engine/orchestration/NetworkOrchestrator.java | 46 +-
.../engine/orchestration/VolumeOrchestrator.java | 24 +-
.../java/com/cloud/dc/dao/AccountVlanMapDao.java | 2 +-
.../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 4 +-
.../java/com/cloud/dc/dao/DomainVlanMapDao.java | 2 +-
.../com/cloud/dc/dao/DomainVlanMapDaoImpl.java | 4 +-
.../META-INF/db/views/cloud.user_vm_view.sql | 1 +
.../storage/image/BaseImageStoreDriverImpl.java | 26 +-
.../extensions/api/CreateExtensionCmd.java | 10 +
.../extensions/api/UpdateExtensionCmd.java | 10 +
.../extensions/manager/ExtensionsManagerImpl.java | 98 +++-
.../extensions/api/CreateExtensionCmdTest.java | 14 +
.../extensions/api/UpdateExtensionCmdTest.java | 15 +
.../manager/ExtensionsManagerImplTest.java | 167 +++++-
.../manager/BareMetalTemplateAdapter.java | 1 -
.../driver/MinIOObjectStoreDriverImpl.java | 81 ++-
.../driver/MinIOObjectStoreDriverImplTest.java | 7 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 27 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 128 +++--
.../java/com/cloud/network/NetworkServiceImpl.java | 26 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 51 +-
.../com/cloud/projects/ProjectManagerImpl.java | 52 +-
.../cloud/resourcelimit/CheckedReservation.java | 117 +++-
.../com/cloud/resourcelimit/ReservationHelper.java | 16 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 212 +++----
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 180 +++++-
.../com/cloud/storage/VolumeApiServiceImpl.java | 636 +++++++++++----------
.../storage/download/DownloadActiveState.java | 5 +
.../cloud/storage/download/DownloadErrorState.java | 5 +
.../storage/download/DownloadInactiveState.java | 6 +
...edState.java => DownloadLimitReachedState.java} | 21 +-
.../cloud/storage/download/DownloadListener.java | 89 ++-
.../com/cloud/storage/download/DownloadState.java | 6 +-
.../storage/snapshot/SnapshotManagerImpl.java | 238 ++++----
.../cloud/template/HypervisorTemplateAdapter.java | 39 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../com/cloud/template/TemplateManagerImpl.java | 309 +++++-----
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 341 +++++------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 29 +-
.../cloudstack/backup/BackupManagerImpl.java | 129 +++--
.../storage/object/BucketApiServiceImpl.java | 114 ++--
.../volume/VolumeImportUnmanageManagerImpl.java | 21 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 489 ++++++++--------
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 4 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 14 +-
.../resourcelimit/CheckedReservationTest.java | 17 +-
.../ResourceLimitManagerImplTest.java | 112 +---
.../cloud/storage/VolumeApiServiceImplTest.java | 52 +-
.../storage/snapshot/SnapshotManagerImplTest.java | 4 +-
.../storage/snapshot/SnapshotManagerTest.java | 55 +-
.../cloud/template/TemplateManagerImplTest.java | 137 ++---
.../java/com/cloud/vm/UserVmManagerImplTest.java | 75 ++-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 8 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 41 +-
.../cloudstack/backup/BackupManagerTest.java | 186 +++---
.../storage/object/BucketApiServiceImplTest.java | 137 ++++-
.../VolumeImportUnmanageManagerImplTest.java | 3 -
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 96 ++--
.../storage/resource/HttpUploadServerHandler.java | 2 +
.../resource/NfsSecondaryStorageResource.java | 33 +-
.../storage/template/DownloadManagerImpl.java | 2 +-
ui/public/locales/en.json | 1 +
ui/src/config/section/extension.js | 2 +-
ui/src/views/extension/CreateExtension.vue | 11 +
ui/src/views/extension/UpdateExtension.vue | 17 +-
90 files changed, 2975 insertions(+), 1992 deletions(-)
copy api/src/main/java/{com/cloud/network/rules/LoadBalancer.java =>
org/apache/cloudstack/resourcelimit/Reserver.java} (68%)
copy api/src/main/java/com/cloud/exception/InvalidParameterValueException.java
=> server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java (72%)
copy
server/src/main/java/com/cloud/storage/download/{DownloadAbandonedState.java =>
DownloadLimitReachedState.java} (67%)
