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 cabb0f62754 4.20/main Health Check, please don't merge this!
     add 74e9146cfb4 check for custom offering and trim size (#10629)
     add d697cff8987 Update dependency required for test_outofbandmanagement.py 
(#10805)
     add 1f8442eb69a Extra checks in UI when deleting accounts (#10760)
     add f6d05904243 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add c1923a2dcb3 test: cleanup test_guest_os.py for multiple execution 
(#10818)
     add c45ed060982 test: fix test_hostha_simulator.py and 
test_outofbandmanagement.py (#10815)
     add 2674da2ee9e Nas BnR: Fix for restore not working correctly  (#10785)
     add f4ca7064b70 Add search bar on rules of roles (#10822)
     add 7e2aa0efe42 engine/schema: create default network offering for vpc 
tier with conserve_mode=1 for fresh installation (#10744)
     add c453aaea2cf ui: improve metrics api use in list views (#9825)
     add 17e062a3813 StorPool notify libvirt when volume is resized (#10775)
     add 919c9797cc8 server: prevent duplicate HA works and alerts (#10624)
     add f0838cdd309 [VMware] Update vlans with proper range before creating 
port group for dvSwitch (#10708)
     add 696bc50f3ba Backport #9888 to 4.19: Fix Usage inconsistencies (#10712)
     add 751a0ad5598 UI workaround for the inconsistent formatting of 
listVirtualMachinesUsageHistory (#10824)
     add ea32a1a71aa server: fetch IP of VMs on L2 networks (#10431)
     add 0a090f48533 cleanup call on super (#10807)
     add e68abcd85de xenserver: destroy halted vm on expunge (#10833)
     add a21f912be3d Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 04731b06182 fix logger
     add 1e5d1330336 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 6fdaf51ddc0 KVM incremental snapshot feature (#9270)
     add 265f4cdc288 core: support chunked transfer for image files (#10820)
     add 011fced91ed ehancement: add password to configdrive vendor_data.json 
(#10061)
     add bcd23ebb8ac server: check if redundant router is supported when 
restart network with makeredundant = true (#10612)
     add 3959dbdbe63 refactor create duplicate alert check (#10544)
     add 47a268202bc [VMware] Sync the disk path or datastore changes for IDE 
disks, and before any volume resize during start vm (for the volumes on 
datastore cluster) (#10748)
     add 88ce639255d Linstor:  implement volume and storage stats (#10850)
     add dd84c74e822 Merge branch '4.19' into 4.20
     add 0648d000b24 Support XenServer 8.4 / XCP 8.3 - make scripts python3 
compatible (#10684)
     add 64828f66e81 Merge branch '4.20'
     add 0ac9e030860 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   (cabb0f62754)
            \
             N -- N -- N   refs/heads/healthcheck-main (0ac9e030860)

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:
 .github/workflows/ci.yml                           |   2 +-
 agent/conf/agent.properties                        |   6 +
 .../cloud/agent/properties/AgentProperties.java    |  10 +
 api/src/main/java/com/cloud/storage/Snapshot.java  |   2 +-
 .../com/cloud/agent/api/ConvertSnapshotAnswer.java |  16 +-
 .../cloud/agent/api/ConvertSnapshotCommand.java    |  22 +-
 .../com/cloud/agent/api/GetVmIpAddressCommand.java |   8 +-
 ...ommand.java => RecreateCheckpointsCommand.java} |  25 +-
 ...etworkCommand.java => RemoveBitmapCommand.java} |  27 +-
 .../StorageSubsystemCommandHandlerBase.java        |   2 +-
 .../storage/template/HttpTemplateDownloader.java   |  99 ++-
 .../cloud/storage/template/TemplateConstants.java  |   2 +-
 .../cloudstack/storage/to/SnapshotObjectTO.java    |  74 ++-
 .../cloudstack/storage/to/VolumeObjectTO.java      |  23 +
 .../service/VolumeOrchestrationService.java        |   6 +
 .../subsystem/api/storage/EndPointSelector.java    |   4 +
 .../api/storage/ObjectInDataStoreStateMachine.java |   3 +-
 .../engine/subsystem/api/storage/SnapshotInfo.java |  12 +
 .../subsystem/api/storage/SnapshotService.java     |   4 +
 .../subsystem/api/storage/StorageAction.java       |   2 +
 .../engine/subsystem/api/storage/VolumeInfo.java   |   7 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |  13 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  78 +++
 .../engine/orchestration/NetworkOrchestrator.java  |   2 +-
 .../engine/orchestration/VolumeOrchestrator.java   |  29 +
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  77 +++
 .../orchestration/VolumeOrchestratorTest.java      |  58 ++
 .../src/main/java/com/cloud/host/dao/HostDao.java  |   3 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |  23 +
 .../main/java/com/cloud/storage/SnapshotVO.java    |   2 +-
 .../java/com/cloud/usage/dao/UsageNetworksDao.java |   2 +
 .../com/cloud/usage/dao/UsageNetworksDaoImpl.java  |  17 +
 .../main/java/com/cloud/usage/dao/UsageVpcDao.java |   4 +
 .../java/com/cloud/usage/dao/UsageVpcDaoImpl.java  |  18 +
 .../storage/datastore/db/SnapshotDataStoreDao.java |  17 +-
 .../datastore/db/SnapshotDataStoreDaoImpl.java     | 158 ++++-
 .../storage/datastore/db/SnapshotDataStoreVO.java  |  33 +-
 .../resources/META-INF/db/schema-42000to42010.sql  |  56 ++
 .../resources/META-INF/db/schema-42010to42100.sql  |   5 +
 ...-cleanup.sql => schema-42010to42100cleanup.sql} |   2 +-
 .../storage/configdrive/ConfigDriveBuilder.java    |  43 +-
 .../configdrive/ConfigDriveBuilderTest.java        |  20 +-
 .../storage/snapshot/DefaultSnapshotStrategy.java  | 155 +++--
 .../storage/snapshot/SnapshotObject.java           |  73 ++-
 .../storage/snapshot/SnapshotServiceImpl.java      | 153 ++++-
 .../snapshot/DefaultSnapshotStrategyTest.java      |  99 ++-
 .../storage/snapshot/SnapshotServiceImplTest.java  | 157 ++++-
 .../datastore/ObjectInDataStoreManagerImpl.java    |  58 +-
 .../storage/endpoint/DefaultEndPointSelector.java  | 108 ++-
 .../datastore/db/SnapshotDataStoreDaoImplTest.java |   4 +-
 .../endpoint/DefaultEndPointSelectorTest.java      | 200 ++++++
 .../cloudstack/storage/volume/VolumeObject.java    |  22 +
 .../storage/volume/VolumeServiceImpl.java          |  24 +-
 .../storage/volume/VolumeObjectTest.java           |  17 +-
 .../storage/volume/VolumeServiceTest.java          |  16 +-
 plugins/hypervisors/kvm/pom.xml                    |   4 +
 .../kvm/resource/LibvirtComputingResource.java     | 150 ++++-
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |  21 +
 .../LibvirtConvertSnapshotCommandWrapper.java      | 106 +++
 .../LibvirtGetVmIpAddressCommandWrapper.java       |  57 +-
 .../wrapper/LibvirtMigrateCommandWrapper.java      |  32 +-
 ... LibvirtRecreateCheckpointsCommandWrapper.java} |  27 +-
 .../wrapper/LibvirtRemoveBitmapCommandWrapper.java | 130 ++++
 .../LibvirtRestoreBackupCommandWrapper.java        |  16 +-
 .../LibvirtRevertSnapshotCommandWrapper.java       |  45 +-
 .../wrapper/LibvirtStartCommandWrapper.java        |  10 +
 .../hypervisor/kvm/storage/KVMStoragePool.java     |   5 +
 .../kvm/storage/KVMStorageProcessor.java           | 727 ++++++++++++++++++---
 .../kvm/storage/LibvirtStorageAdaptor.java         |   7 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |  75 +++
 .../kvm/resource/LibvirtComputingResourceTest.java |  75 ++-
 .../LibvirtGetVmIpAddressCommandWrapperTest.java   |   3 +
 .../LibvirtRevertSnapshotCommandWrapperTest.java   |  50 +-
 .../kvm/storage/KVMStorageProcessorTest.java       |  83 ++-
 plugins/hypervisors/ovm/pom.xml                    |   2 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 384 +++++------
 plugins/hypervisors/xenserver/pom.xml              |   2 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |   9 +
 .../xenserver/discoverer/XcpServerDiscoverer.java  |   7 +-
 .../xenserver/resource/CitrixResourceBase.java     |   4 +
 ...er600Resource.java => XcpServer83Resource.java} |   4 +-
 .../resource/XenServerConnectionPool.java          |  10 +-
 ...er600Resource.java => Xenserver84Resource.java} |   5 +-
 .../xenbase/CitrixCleanupVMCommandWrapper.java     |  78 +++
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |  25 +-
 .../java/com/xensource/xenapi/ConnectionNew.java   | 335 ++++++++++
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |   2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |  37 +-
 plugins/storage/volume/linstor/CHANGELOG.md        |   5 +
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  78 ++-
 .../util/LinstorConfigurationManager.java          |   9 +-
 .../storage/datastore/util/LinstorUtil.java        |  32 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |  57 +-
 pom.xml                                            |   4 +-
 scripts/storage/qcow2/managesnapshot.sh            |   2 +-
 .../xenserver/{xcpserver => xcpserver83}/NFSSR.py  |  38 +-
 .../xenserver/{xcpserver => xcpserver83}/patch     |   9 +-
 .../{ => xenserver84}/cloud-plugin-storage         |  17 +-
 .../{ => xenserver84}/cloudstack_pluginlib.py      |  77 +--
 .../xenserver/{ => xenserver84}/ovs-vif-flows.py   |  34 +-
 .../xenserver/{xenserver65 => xenserver84}/patch   |  16 +-
 .../hypervisor/xenserver/{ => xenserver84}/swift   |  52 +-
 .../hypervisor/xenserver/{ => xenserver84}/vmops   | 598 ++++++++---------
 .../xenserver/{ => xenserver84}/vmopsSnapshot      |  89 ++-
 .../xenserver/{ => xenserver84}/vmopspremium       |  18 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |  96 +--
 .../main/java/com/cloud/configuration/Config.java  |   1 -
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |  35 +-
 .../java/com/cloud/ha/dao/HighAvailabilityDao.java |   3 +
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |  13 +
 .../java/com/cloud/network/NetworkServiceImpl.java |   6 +
 .../com/cloud/storage/CreateSnapshotPayload.java   |   9 +
 .../java/com/cloud/storage/StorageManagerImpl.java |  13 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   2 +
 .../cloud/storage/snapshot/SnapshotManager.java    |  18 +-
 .../storage/snapshot/SnapshotManagerImpl.java      | 244 +++++--
 .../com/cloud/template/TemplateManagerImpl.java    |   8 +-
 .../main/java/com/cloud/test/DatabaseConfig.java   |   3 -
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  25 +-
 .../apache/cloudstack/snapshot/SnapshotHelper.java |   8 +
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |   2 -
 .../resource/NfsSecondaryStorageResource.java      |  52 +-
 .../storage/template/DownloadManagerImpl.java      |   2 +
 .../storage/template/UploadManagerImpl.java        |  29 +-
 .../component/test_affinity_groups_projects.py     |  17 +-
 .../smoke/test_deploy_vm_extra_config_data.py      |   4 +-
 test/integration/smoke/test_guest_os.py            |  26 +-
 test/integration/smoke/test_hostha_simulator.py    |   2 +-
 test/integration/smoke/test_outofbandmanagement.py |   2 +-
 tools/marvin/marvin/lib/base.py                    |  15 +-
 ui/public/locales/en.json                          |  10 +-
 ui/public/locales/pt_BR.json                       |   1 +
 ui/src/components/view/StatsTab.vue                |   2 +-
 ui/src/config/router.js                            |   1 -
 ui/src/config/section/account.js                   |   5 +-
 ui/src/config/section/compute.js                   |   3 +-
 ui/src/config/section/infra/clusters.js            |   4 +-
 ui/src/config/section/infra/hosts.js               |   8 +-
 ui/src/config/section/infra/zones.js               |   4 +-
 ui/src/views/AutogenView.vue                       |   7 +-
 ui/src/views/iam/DeleteAccount.vue                 | 176 +++++
 ui/src/views/iam/DeleteAccountWrapper.vue          |  74 +++
 ui/src/views/iam/RolePermissionTab.vue             |  28 +-
 ui/src/views/storage/CreateVolume.vue              |   3 +
 .../java/com/cloud/usage/UsageManagerImpl.java     |  95 ++-
 .../src/main/java/com/cloud/utils/StringUtils.java |  92 ++-
 .../main/java/com/cloud/utils/script/Script.java   |  14 +
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |  22 +-
 .../vmware/mo/HypervisorHostHelperTest.java        |  56 +-
 149 files changed, 5543 insertions(+), 1461 deletions(-)
 copy 
plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolBackupSnapshotCommand.java
 => core/src/main/java/com/cloud/agent/api/ConvertSnapshotAnswer.java (70%)
 copy 
plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolBackupSnapshotCommand.java
 => core/src/main/java/com/cloud/agent/api/ConvertSnapshotCommand.java (64%)
 copy core/src/main/java/com/cloud/agent/api/{NetworkRulesSystemVmCommand.java 
=> RecreateCheckpointsCommand.java} (72%)
 copy core/src/main/java/com/cloud/agent/api/{CheckNetworkCommand.java => 
RemoveBitmapCommand.java} (64%)
 copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql 
=> schema-42010to42100cleanup.sql} (94%)
 create mode 100644 
engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertSnapshotCommandWrapper.java
 copy 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtOvsDestroyBridgeCommandWrapper.java
 => LibvirtRecreateCheckpointsCommandWrapper.java} (54%)
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRemoveBitmapCommandWrapper.java
 copy 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java
 => XcpServer83Resource.java} (87%)
 copy 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java
 => Xenserver84Resource.java} (87%)
 create mode 100644 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java
 create mode 100644 
plugins/hypervisors/xenserver/src/main/java/com/xensource/xenapi/ConnectionNew.java
 copy scripts/vm/hypervisor/xenserver/{xcpserver => xcpserver83}/NFSSR.py (90%)
 copy scripts/vm/hypervisor/xenserver/{xcpserver => xcpserver83}/patch (90%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloud-plugin-storage 
(97%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloudstack_pluginlib.py 
(95%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/ovs-vif-flows.py (84%)
 copy scripts/vm/hypervisor/xenserver/{xenserver65 => xenserver84}/patch (89%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/swift (98%)
 mode change 100755 => 100644
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmops (76%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopsSnapshot (94%)
 mode change 100755 => 100644
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopspremium (95%)
 create mode 100644 ui/src/views/iam/DeleteAccount.vue
 create mode 100644 ui/src/views/iam/DeleteAccountWrapper.vue

Reply via email to