This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a7dc5efad517074b142bf9b872cd8c0e3ae35664 Merge: c79b33c1fbd 11df71e55cc Author: Daan Hoogland <[email protected]> AuthorDate: Tue Feb 17 11:55:04 2026 +0100 Merge release branch 4.22 to main * 4.22: Fix issue when restoring backup after migration of volume (#12549) Usage: Heartbeat should not schedule usage job when a job is already running (#12616) Allow limit queries without random ordering (#12598) engine/schema: fix cluster/zone settings with encrypted values (#12626) Fix injection of preset variables into the JS interpreter (#12515) Fix issue with multiple KVM Host entries in host table (#12589) Add a Prometheus metric to track host certificate expiry (#12613) ssvm: delete temp directory while deleting entity download url (#12562) .../cloudstack/backup/RestoreBackupCommand.java | 18 +-- .../java/com/cloud/resource/ResourceManager.java | 2 + .../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 2 +- .../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 +- .../main/java/com/cloud/host/dao/HostDaoImpl.java | 2 +- .../storage/datastore/db/ImageStoreDaoImpl.java | 2 +- .../src/main/java/com/cloud/utils/db/Filter.java | 13 +- .../java/com/cloud/utils/db/GenericDaoBase.java | 6 +- .../test/java/com/cloud/utils/db/FilterTest.java | 58 +++++++ .../com/cloud/utils/db/GenericDaoBaseTest.java | 68 ++++++++ .../apache/cloudstack/quota/QuotaManagerImpl.java | 12 +- .../activationrule/presetvariables/Account.java | 2 - .../presetvariables/BackupOffering.java | 1 - .../presetvariables/ComputeOffering.java | 3 - .../presetvariables/Configuration.java | 1 - .../DiskOfferingPresetVariables.java | 12 -- .../activationrule/presetvariables/Domain.java | 1 - .../presetvariables/GenericPresetVariable.java | 18 +-- .../quota/activationrule/presetvariables/Host.java | 2 - .../presetvariables/PresetVariableHelper.java | 12 +- .../quota/activationrule/presetvariables/Role.java | 9 +- .../activationrule/presetvariables/Storage.java | 11 +- .../activationrule/presetvariables/Tariff.java | 1 - .../activationrule/presetvariables/Value.java | 48 ++---- .../cloudstack/quota/QuotaManagerImplTest.java | 24 +-- .../presetvariables/AccountTest.java | 34 ---- .../presetvariables/BackupOfferingTest.java | 36 ----- .../presetvariables/ComputeOfferingTest.java | 35 ----- .../presetvariables/ComputingResourcesTest.java | 40 ----- .../activationrule/presetvariables/DomainTest.java | 35 ----- .../presetvariables/GenericPresetVariableTest.java | 73 --------- .../activationrule/presetvariables/HostTest.java | 34 ---- .../presetvariables/PresetVariableHelperTest.java | 134 +++++----------- .../presetvariables/ResourceTest.java | 40 ----- .../activationrule/presetvariables/RoleTest.java | 34 ---- .../presetvariables/StorageTest.java | 41 ----- .../activationrule/presetvariables/ValueTest.java | 175 --------------------- .../cloudstack/backup/NASBackupProvider.java | 30 +++- .../LibvirtRestoreBackupCommandWrapper.java | 67 ++++---- .../LibvirtRestoreBackupCommandWrapperTest.java | 19 ++- .../cloudstack/metrics/PrometheusExporterImpl.java | 43 +++++ .../metrics/PrometheusExporterImplTest.java | 108 +++++++++++++ .../com/cloud/resource/ResourceManagerImpl.java | 27 +++- .../storage/heuristics/HeuristicRuleHelper.java | 20 +-- .../heuristics/presetvariables/Account.java | 2 - .../storage/heuristics/presetvariables/Domain.java | 1 - .../GenericHeuristicPresetVariable.java | 17 +- .../presetvariables/SecondaryStorage.java | 4 - .../heuristics/presetvariables/Snapshot.java | 10 +- .../heuristics/presetvariables/Template.java | 24 ++- .../storage/heuristics/presetvariables/Volume.java | 10 +- .../cloud/resource/MockResourceManagerImpl.java | 5 + .../heuristics/HeuristicRuleHelperTest.java | 16 ++ .../heuristics/presetvariables/AccountTest.java | 46 ------ .../heuristics/presetvariables/DomainTest.java | 41 ----- .../GenericHeuristicPresetVariableTest.java | 40 ----- .../presetvariables/SecondaryStorageTest.java | 45 ------ .../heuristics/presetvariables/SnapshotTest.java | 44 ------ .../heuristics/presetvariables/TemplateTest.java | 46 ------ .../heuristics/presetvariables/VolumeTest.java | 44 ------ .../storage/template/UploadManagerImpl.java | 51 +++++- .../storage/template/UploadManagerImplTest.java | 85 ++++++++++ .../java/com/cloud/usage/UsageManagerImpl.java | 20 ++- .../utils/jsinterpreter/JsInterpreter.java | 33 ++-- .../utils/jsinterpreter/TagAsRuleHelper.java | 21 ++- .../utils/jsinterpreter/JsInterpreterTest.java | 18 --- 66 files changed, 710 insertions(+), 1268 deletions(-)
