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
discard 0f13b4a79b1 VPC restart cleanup for Public networks with multi-CIDR
data (#12622)
omit b02b652aa0c Support list/query async jobs by resource (#12983)
omit 2b84ddb9b1d Merge branch '22.0.1' into 4.22
omit d6f4fc3ac40 Updating pom.xml version numbers for release 22.0.1
omit 19b4ef10693 server: reserve backup, bucket resource limits during
operations
omit 8608b4edd02 Fix snapshot copy resource limit concurrency
omit f3331344566 Address merge issues
omit e8d57d1b0dc Implement/fix limit validation for secondary storage
omit 86c9f7bd941 Fix backup list
omit 24fd440ee72 Fix create VM from backup
omit 8ce1c9876ee fix restore volume from backup and attach
omit 9db630932e0 Address public IP limit validations
omit c6b20b8cc7f Fix failing tests
omit 88a12a801f8 Cleanup imported VM from disk on failure due to volume
allocation + prevent duplicate volume and primary storage increment on import
omit 9c0c8da706e [22.0] Address limit checks for VM, CPU, memory, volume,
and primary storage
omit f7f0e751225 Fixed a merge issue in ImageStoreUploadMonitorImpl
omit 07c3dc86b2d [22.0] Consider infinite resources when calculating
secondary storage limit for upload operations
omit d7224151053 [22.0] secondary storage resource limit for upload
omit 5d5ee7b6893 volume download fix
omit 4855d40e6e3 [22.0] secondary storage resource limit for download
omit 95816b44e93 extensions: allow reserved resource details
omit d11d182c715 [22.0] Fix resource limit reservation and check during
StartVirtualMachine
omit 3d678e726ad [22.0] resource reservation on volume snapshot creation
omit 7703fdacab4 [minio] Handle user's canned policy when a bucket is
deleted
omit 46a6bbad270 Fix: KVM Direct Download URL injection (#60)
omit 1f849caa0be [22.0] resource reservation on volume creation
omit 831ef82ff9b [22.0] resource allocation vpc
omit 8d269cf5bef [22.0] Implement/fix limit validation for projects
omit 003c8408179 [22.0] resource instance limits
omit 37e36577707 [22.0] resource allocation
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/4.22 (7c7b2ae75d1)
\
O -- O -- O (0f13b4a79b1)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
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 +-
.../cloudstack/api/ApiCommandResourceType.java | 4 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 -
.../user/account/AddAccountToProjectCmd.java | 3 +-
.../command/user/account/AddUserToProjectCmd.java | 3 +-
.../RestoreVolumeFromBackupAndAttachToVMCmd.java | 4 -
.../api/command/user/job/ListAsyncJobsCmd.java | 15 -
.../command/user/job/QueryAsyncJobResultCmd.java | 18 +-
.../api/command/user/vm/CreateVMFromBackupCmd.java | 1 -
.../cloudstack/api/response/ExtensionResponse.java | 10 -
.../cloudstack/extension/ExtensionHelper.java | 3 -
.../apache/cloudstack/resourcelimit/Reserver.java | 30 -
.../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 +-
.../resources/META-INF/db/schema-42200to42210.sql | 9 -
.../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 +-----
.../cloudstack/framework/jobs/dao/AsyncJobDao.java | 18 -
.../framework/jobs/dao/AsyncJobDaoImpl.java | 33 --
.../manager/BareMetalTemplateAdapter.java | 1 +
.../driver/MinIOObjectStoreDriverImpl.java | 81 +--
.../driver/MinIOObjectStoreDriverImplTest.java | 7 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 -
.../main/java/com/cloud/api/ApiResponseHelper.java | 36 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 45 +-
.../com/cloud/api/query/ResourceIdSupport.java | 123 ----
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 23 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 7 -
.../configuration/ConfigurationManagerImpl.java | 141 ++---
.../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 | 35 --
.../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 -
.../download/DownloadLimitReachedState.java | 54 --
.../cloud/storage/download/DownloadListener.java | 89 +--
.../com/cloud/storage/download/DownloadState.java | 6 +-
.../storage/snapshot/SnapshotManagerImpl.java | 214 ++++---
.../cloud/template/HypervisorTemplateAdapter.java | 39 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../com/cloud/template/TemplateManagerImpl.java | 256 ++++-----
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 322 +++--------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 21 +-
.../cloudstack/backup/BackupManagerImpl.java | 129 ++---
.../storage/object/BucketApiServiceImpl.java | 114 ++--
.../volume/VolumeImportUnmanageManagerImpl.java | 20 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 425 ++++++--------
.../com/cloud/api/query/QueryManagerImplTest.java | 2 +-
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 1 -
.../com/cloud/network/vpc/VpcManagerImplTest.java | 14 +-
.../resourcelimit/CheckedReservationTest.java | 17 +-
.../ResourceLimitManagerImplTest.java | 108 +++-
.../cloud/storage/VolumeApiServiceImplTest.java | 52 +-
.../storage/snapshot/SnapshotManagerImplTest.java | 4 +-
.../storage/snapshot/SnapshotManagerTest.java | 55 +-
.../cloud/template/TemplateManagerImplTest.java | 132 +++--
.../java/com/cloud/vm/UserVmManagerImplTest.java | 43 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 2 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 41 +-
.../cloudstack/backup/BackupManagerTest.java | 127 +---
.../storage/object/BucketApiServiceImplTest.java | 137 +----
.../VolumeImportUnmanageManagerImplTest.java | 3 +
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 57 +-
.../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 +-
100 files changed, 1689 insertions(+), 3339 deletions(-)
delete mode 100644
api/src/main/java/org/apache/cloudstack/resourcelimit/Reserver.java
delete mode 100644
server/src/main/java/com/cloud/api/query/ResourceIdSupport.java
delete mode 100644
server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java
delete mode 100644
server/src/main/java/com/cloud/storage/download/DownloadLimitReachedState.java
