summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-01-08 14:55:49 +0100
committerMartin Polden <mpolden@mpolden.no>2020-01-13 12:06:58 +0100
commit2d93fb0f9f0642af57ebfb74e5af0a678c12f45a (patch)
tree1fb1147170aa58427f28d8d27ad5c841d8baf3cb
parent7dccc1f6412808b4c10adbe8d109724c3899ff24 (diff)
Rename field
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Maintainer.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Maintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Maintainer.java
index d6759b4bf11..9c3c1dc1f5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Maintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Maintainer.java
@@ -33,13 +33,15 @@ public abstract class Maintainer extends AbstractComponent implements Runnable {
private final JobControl jobControl;
private final ScheduledExecutorService service;
private final String name;
- private final Set<SystemName> permittedSystems;
+
+ /** The systems in which this maintainer should run */
+ private final Set<SystemName> activeSystems;
public Maintainer(Controller controller, Duration interval, JobControl jobControl) {
this(controller, interval, jobControl, null, EnumSet.allOf(SystemName.class));
}
- public Maintainer(Controller controller, Duration interval, JobControl jobControl, String name, Set<SystemName> permittedSystems) {
+ public Maintainer(Controller controller, Duration interval, JobControl jobControl, String name, Set<SystemName> activeSystems) {
if (interval.isNegative() || interval.isZero())
throw new IllegalArgumentException("Interval must be positive, but was " + interval);
@@ -47,7 +49,7 @@ public abstract class Maintainer extends AbstractComponent implements Runnable {
this.maintenanceInterval = interval;
this.jobControl = jobControl;
this.name = name;
- this.permittedSystems = Set.copyOf(permittedSystems);
+ this.activeSystems = Set.copyOf(activeSystems);
service = new ScheduledThreadPoolExecutor(1);
long delay = staggeredDelay(controller.curator().cluster(), controller.hostname(), controller.clock().instant(), interval);
@@ -60,7 +62,7 @@ public abstract class Maintainer extends AbstractComponent implements Runnable {
@Override
public void run() {
try {
- if ( ! permittedSystems.contains(controller.system())) {
+ if ( ! activeSystems.contains(controller.system())) {
return;
}
if (jobControl.isActive(name())) {