diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-02-04 13:30:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-04 13:30:15 +0100 |
commit | bbbfcfa38c01142e8fd56b48fb08da30cd38383d (patch) | |
tree | f224aaf98dc2c1bafbb749a42c83fbd7cd1eb9a1 /controller-server | |
parent | 6447fb40266ed2c68227644559b8df8299c8ff80 (diff) | |
parent | 61859ed7d1fe8134a66ef71f31c3dab8ff93e3c0 (diff) |
Merge pull request #21057 from vespa-engine/olaa/billing-db-maintainer
Adds billing db maintainer
Diffstat (limited to 'controller-server')
3 files changed, 30 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingDatabaseMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingDatabaseMaintainer.java new file mode 100644 index 00000000000..a7ebaec7c09 --- /dev/null +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingDatabaseMaintainer.java @@ -0,0 +1,24 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.controller.maintenance; + +import com.yahoo.config.provision.SystemName; +import com.yahoo.vespa.hosted.controller.Controller; + +import java.time.Duration; +import java.util.EnumSet; + +/** + * @author olaa + */ +public class BillingDatabaseMaintainer extends ControllerMaintainer { + + public BillingDatabaseMaintainer(Controller controller, Duration interval) { + super(controller, interval, null, EnumSet.of(SystemName.PublicCd)); + } + + @Override + protected double maintain() { + controller().serviceRegistry().billingDatabase().maintain(); + return 1; + } +} diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java index f7dfadbffbc..bde39aa3dd6 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java @@ -75,6 +75,7 @@ public class ControllerMaintenance extends AbstractComponent { maintainers.add(new CloudTrialExpirer(controller, intervals.defaultInterval)); maintainers.add(new RetriggerMaintainer(controller, intervals.retriggerMaintainer)); maintainers.add(new UserManagementMaintainer(controller, intervals.userManagementMaintainer, controller.serviceRegistry().roleMaintainer())); + maintainers.add(new BillingDatabaseMaintainer(controller, intervals.billingDatabaseMaintainer)); } public Upgrader upgrader() { return upgrader; } @@ -132,6 +133,7 @@ public class ControllerMaintenance extends AbstractComponent { private final Duration vcmrMaintainer; private final Duration retriggerMaintainer; private final Duration userManagementMaintainer; + private final Duration billingDatabaseMaintainer; public Intervals(SystemName system) { this.system = Objects.requireNonNull(system); @@ -166,6 +168,7 @@ public class ControllerMaintenance extends AbstractComponent { this.vcmrMaintainer = duration(1, HOURS); this.retriggerMaintainer = duration(1, MINUTES); this.userManagementMaintainer = duration(12, HOURS); + this.billingDatabaseMaintainer = duration(5, MINUTES); } private Duration duration(long amount, TemporalUnit unit) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json index 2edf1867fd3..0dad88e645b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json @@ -13,6 +13,9 @@ "name": "ArchiveUriUpdater" }, { + "name": "BillingDatabaseMaintainer" + }, + { "name": "ChangeRequestMaintainer" }, { |