This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit c6b92cc7de2 4.20 Health Check, please don't merge this!
add b45726f7b12 ssvm: delete temp directory while deleting entity download
url (#12562)
add 4de8c2b6f68 Add a Prometheus metric to track host certificate expiry
(#12613)
add b7c970f45f1 Fix issue with multiple KVM Host entries in host table
(#12589)
add 34f6f413a1f Fix injection of preset variables into the JS interpreter
(#12515)
add 18d66595b39 engine/schema: fix cluster/zone settings with encrypted
values (#12626)
add e22f842ed8d Allow limit queries without random ordering (#12598)
add d8230c9598f Usage: Heartbeat should not schedule usage job when a job
is already running (#12616)
add ae5308bdd20 Fix issue when restoring backup after migration of volume
(#12549)
add 7f6952da2bb 4.20 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 (c6b92cc7de2)
\
N -- N -- N refs/heads/healthcheck-4.20 (7f6952da2bb)
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:
.../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 | 1 -
.../presetvariables/BackupOffering.java | 1 -
.../presetvariables/ComputeOffering.java | 1 -
.../activationrule/presetvariables/Domain.java | 1 -
.../presetvariables/GenericPresetVariable.java | 18 +--
.../quota/activationrule/presetvariables/Host.java | 2 -
.../presetvariables/PresetVariableHelper.java | 10 +-
.../quota/activationrule/presetvariables/Role.java | 9 +-
.../activationrule/presetvariables/Storage.java | 11 +-
.../activationrule/presetvariables/Tariff.java | 1 -
.../activationrule/presetvariables/Value.java | 40 ++---
.../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 | 68 ++------
.../presetvariables/ResourceTest.java | 40 -----
.../activationrule/presetvariables/RoleTest.java | 34 ----
.../presetvariables/StorageTest.java | 41 -----
.../activationrule/presetvariables/ValueTest.java | 175 ---------------------
.../cloudstack/backup/NASBackupProvider.java | 24 ++-
.../LibvirtRestoreBackupCommandWrapper.java | 50 +++---
.../cloudstack/metrics/PrometheusExporterImpl.java | 43 +++++
.../metrics/PrometheusExporterImplTest.java | 108 +++++++++++++
.../com/cloud/resource/ResourceManagerImpl.java | 27 +++-
.../cloudstack/backup/BackupManagerImpl.java | 2 +-
.../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 | 50 +++++-
.../storage/template/UploadManagerImplTest.java | 85 ++++++++++
.../java/com/cloud/usage/UsageManagerImpl.java | 20 ++-
utils/src/main/java/com/cloud/utils/FileUtil.java | 15 ++
.../utils/jsinterpreter/JsInterpreter.java | 33 ++--
.../utils/jsinterpreter/TagAsRuleHelper.java | 21 ++-
.../utils/jsinterpreter/JsInterpreterTest.java | 18 ---
65 files changed, 662 insertions(+), 1198 deletions(-)
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/AccountTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/DomainTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariableTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/HostTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/RoleTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/StorageTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ValueTest.java
create mode 100644
plugins/integrations/prometheus/src/test/java/org/apache/cloudstack/metrics/PrometheusExporterImplTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/AccountTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/DomainTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/GenericHeuristicPresetVariableTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SecondaryStorageTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SnapshotTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/TemplateTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/VolumeTest.java
create mode 100644
services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/template/UploadManagerImplTest.java
