This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch healthcheck-main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard f84aa0eaf9d 4.20/main Health Check, please don't merge this! add c2259cef5d2 docs: correct outdated Maven link in install.md (#10800) add 9f229600e6a Add new config (non-dynamic) for agent connections monitor thread, and keep timeunit to secs (in sync with the earlier Wait config) (#10525) add 0e0ae226bd2 Xenserver smoke-test: Allow emojis to be accepted in volume name during volume creation (#10774) add 030ed55f36c server/test: ResourceCleanupService test fix for daylight saving time (#10749) add 02d1c61cf77 add amount of system VMs that are allocated to each host in the hosts ListView (#10791) add dfd64b1a672 Ceph object store: Fix LocationConstraint error (#10772) add fe77f5f2856 server: apply network ACL even if there is no network ACLs in the ACL list (#9374) (#10241) add 7f16a207e0a cloudutils: use ip command instead of route in networkConfig.py (#10726) add 0c4ed1e5b72 UI: Allow editing VM name of a Running VM in an Advanced zone with security groups (#10714) add 4c072b5bf97 UI: show checksum field when register or upload template/isos (#10725) add 01d87b77479 Merge branch '4.19' into 4.20 add d7d9d131b2d Merge branch '4.20' add fd74895ad05 New feature: Reconcile commands (CopyCommand, MigrateCommand, MigrateVolumeCommand) (#10514) add 32cc45e8405 [UI] Allow quiescevm and asyncbackup flags while taking volume snapshot from UI when these are supported for the volume (#10265) add 91c11688618 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20 add 83c3ea2e67f smoke tests / CI : Fix test_vm_stric_host_tags (#10806) add 39c5641cbe6 Merge branch '4.20' of https://github.com/apache/cloudstack add cabb0f62754 4.20/main Health Check, please don't merge this! This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f84aa0eaf9d) \ N -- N -- N refs/heads/healthcheck-main (cabb0f62754) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. 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: INSTALL.md | 6 +- agent/src/main/java/com/cloud/agent/Agent.java | 8 + api/src/main/java/com/cloud/agent/api/Command.java | 34 + .../main/java/com/cloud/agent/api/to/DiskTO.java | 6 +- .../java/com/cloud/agent/api/to/NetworkTO.java | 6 +- .../main/java/com/cloud/agent/api/to/NicTO.java | 8 + .../com/cloud/agent/api/to/VirtualMachineTO.java | 12 +- .../command/ReconcileCommandService.java | 65 ++ .../java/com/cloud/agent/api/MigrateCommand.java | 25 +- .../main/java/com/cloud/agent/api/PingAnswer.java | 15 + .../main/java/com/cloud/agent/api/PingCommand.java | 11 + .../agent/api/storage/MigrateVolumeCommand.java | 5 + .../java/com/cloud/resource/ServerResource.java | 2 + .../main/java/com/cloud/serializer/GsonHelper.java | 2 +- .../org/apache/cloudstack/command/CommandInfo.java | 124 +++ .../cloudstack/command/ReconcileAnswer.java} | 23 +- .../ReconcileCommand.java} | 15 +- .../cloudstack/command/ReconcileCommandUtils.java | 192 ++++ .../cloudstack/command/ReconcileCopyAnswer.java} | 38 +- .../cloudstack/command/ReconcileCopyCommand.java} | 45 +- .../command/ReconcileMigrateAnswer.java} | 46 +- .../command/ReconcileMigrateCommand.java | 14 +- .../command/ReconcileMigrateVolumeAnswer.java} | 32 +- .../command/ReconcileMigrateVolumeCommand.java} | 35 +- .../cloudstack/command/ReconcileVolumeAnswer.java} | 28 +- .../cloudstack/storage/command/CopyCommand.java | 5 + .../agent/test/CheckGuestOsMappingCommandTest.java | 2 - .../command/ReconcileCommandUtilsTest.java | 69 ++ .../main/java/com/cloud/agent/AgentManager.java | 4 +- .../java/com/cloud/agent/manager/AgentAttache.java | 74 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 70 +- .../cloud/agent/manager/ClusteredAgentAttache.java | 9 +- .../agent/manager/ClusteredAgentManagerImpl.java | 6 +- .../agent/manager/ClusteredDirectAgentAttache.java | 5 +- .../cloud/agent/manager/ConnectedAgentAttache.java | 5 +- .../cloud/agent/manager/DirectAgentAttache.java | 5 +- .../java/com/cloud/agent/manager/DummyAttache.java | 5 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 28 +- .../cloud/agent/manager/AgentManagerImplTest.java | 3 +- .../agent/manager/ConnectedAgentAttacheTest.java | 17 +- .../agent/manager/DirectAgentAttacheTest.java | 3 +- .../main/java/com/cloud/storage/dao/VolumeDao.java | 2 + .../java/com/cloud/storage/dao/VolumeDaoImpl.java | 11 + .../cloudstack/command/ReconcileCommandVO.java | 216 ++++ .../command/dao/ReconcileCommandDao.java | 45 + .../command/dao/ReconcileCommandDaoImpl.java | 134 +++ .../spring-engine-schema-core-daos-context.xml | 1 + .../resources/META-INF/db/schema-42010to42100.sql | 23 + .../motion/StorageSystemDataMotionStrategy.java | 51 +- .../vmsnapshot/StorageVMSnapshotStrategy.java | 13 +- .../vmsnapshot/VMSnapshotStrategyKVMTest.java | 4 +- .../java/com/cloud/cluster/ClusterManagerImpl.java | 6 + .../framework/jobs/impl/AsyncJobManagerImpl.java | 33 + .../kvm/resource/LibvirtComputingResource.java | 156 ++- .../resource/disconnecthook/DisconnectHook.java | 59 + .../disconnecthook/MigrationCancelHook.java | 44 +- .../disconnecthook/VolumeMigrationCancelHook.java | 53 + .../LibvirtCheckVirtualMachineCommandWrapper.java | 7 + .../wrapper/LibvirtCopyVolumeCommandWrapper.java | 10 + .../wrapper/LibvirtMigrateCommandWrapper.java | 20 + .../LibvirtMigrateVolumeCommandWrapper.java | 32 +- .../wrapper/LibvirtReconcileCommandWrapper.java | 258 +++++ .../resource/wrapper/LibvirtRequestWrapper.java | 9 +- .../kvm/storage/KVMStorageProcessor.java | 20 +- .../kvm/resource/DisconnectHooksTest.java | 191 ++++ .../kvm/resource/LibvirtComputingResourceTest.java | 10 +- .../hypervisor/vmware/resource/VmwareResource.java | 6 +- .../xenserver/resource/CitrixResourceBase.java | 4 +- .../resource/XenServerStorageProcessor.java | 23 +- .../driver/CephObjectStoreDriverImpl.java | 10 +- .../driver/CephObjectStoreDriverImplTest.java | 2 +- .../driver/ScaleIOPrimaryDataStoreDriver.java | 51 +- python/lib/cloudutils/networkConfig.py | 2 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 8 +- .../main/java/com/cloud/hypervisor/KVMGuru.java | 2 +- .../command/ReconcileCommandServiceImpl.java | 1144 ++++++++++++++++++++ .../network/topology/AdvancedNetworkTopology.java | 5 - .../core/spring-server-core-managers-context.xml | 3 + .../java/com/cloud/hypervisor/KVMGuruTest.java | 4 +- .../resource/ResourceCleanupServiceImplTest.java | 25 +- test/integration/smoke/test_vm_strict_host_tags.py | 6 +- ui/src/config/section/compute.js | 8 +- ui/src/config/section/infra/hosts.js | 7 +- ui/src/views/compute/CreateSnapshotWizard.vue | 13 +- ui/src/views/compute/EditVM.vue | 1 - ui/src/views/image/RegisterOrUploadIso.vue | 9 + ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +- ui/src/views/storage/TakeSnapshot.vue | 9 +- .../java/com/cloud/utils/nio/NioConnection.java | 1 - 89 files changed, 3576 insertions(+), 288 deletions(-) create mode 100644 api/src/main/java/org/apache/cloudstack/command/ReconcileCommandService.java create mode 100644 core/src/main/java/org/apache/cloudstack/command/CommandInfo.java copy core/src/main/java/{com/cloud/agent/api/check/CheckSshAnswer.java => org/apache/cloudstack/command/ReconcileAnswer.java} (61%) copy core/src/main/java/org/apache/cloudstack/{ca/PostCertificateRenewalCommand.java => command/ReconcileCommand.java} (84%) create mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileCommandUtils.java copy core/src/main/java/{com/cloud/agent/api/CancelCommand.java => org/apache/cloudstack/command/ReconcileCopyAnswer.java} (51%) copy core/src/main/java/{com/cloud/agent/api/FreezeThawVMCommand.java => org/apache/cloudstack/command/ReconcileCopyCommand.java} (53%) copy core/src/main/java/{com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java => org/apache/cloudstack/command/ReconcileMigrateAnswer.java} (54%) copy plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsDeleteFlowCommand.java => core/src/main/java/org/apache/cloudstack/command/ReconcileMigrateCommand.java (81%) copy core/src/main/java/{com/cloud/agent/api/FreezeThawVMCommand.java => org/apache/cloudstack/command/ReconcileMigrateVolumeAnswer.java} (62%) copy core/src/main/java/{com/cloud/agent/api/GetVmConfigCommand.java => org/apache/cloudstack/command/ReconcileMigrateVolumeCommand.java} (65%) copy core/src/main/java/{com/cloud/agent/api/GetVolumesOnStorageAnswer.java => org/apache/cloudstack/command/ReconcileVolumeAnswer.java} (52%) create mode 100644 core/src/test/java/org/apache/cloudstack/command/ReconcileCommandUtilsTest.java create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/ReconcileCommandVO.java create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/dao/ReconcileCommandDao.java create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/dao/ReconcileCommandDaoImpl.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/DisconnectHook.java copy server/src/main/java/com/cloud/api/EncodedStringTypeAdapter.java => plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/MigrationCancelHook.java (51%) create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/VolumeMigrationCancelHook.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReconcileCommandWrapper.java create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/DisconnectHooksTest.java create mode 100644 server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java