diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-01-07 13:58:49 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-01-07 14:01:38 +0100 |
commit | cc1ffd862633370be9abbcd702b48941128d60dd (patch) | |
tree | 38e91651e564117988bd64f7ed238b27c756373b /vespajlib | |
parent | 672d9a71ebac45a886c9ee45625890f18af8aa4f (diff) |
Disallow non-staggered initial delay
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java | 10 | ||||
-rw-r--r-- | vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java index bd0e618ba05..223125d9a3a 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java @@ -34,16 +34,16 @@ public abstract class Maintainer implements Runnable { private final ScheduledExecutorService service; private final AtomicBoolean shutDown = new AtomicBoolean(); - public Maintainer(String name, Mode mode, Duration interval, Instant startedAt, JobControl jobControl, JobMetrics jobMetrics, List<String> clusterHostnames) { - this(name, mode, interval, staggeredDelay(interval, startedAt, HostName.getLocalhost(), clusterHostnames), jobControl, jobMetrics); - } - - public Maintainer(String name, Mode mode, Duration interval, Duration initialDelay, JobControl jobControl, JobMetrics jobMetrics) { + public Maintainer(String name, Mode mode, Duration interval, Instant startedAt, JobControl jobControl, + JobMetrics jobMetrics, List<String> clusterHostnames) { this.name = name; this.mode = Objects.requireNonNull(mode); this.interval = requireInterval(interval); this.jobControl = Objects.requireNonNull(jobControl); this.jobMetrics = Objects.requireNonNull(jobMetrics); + Objects.requireNonNull(startedAt); + Objects.requireNonNull(clusterHostnames); + Duration initialDelay = staggeredDelay(interval, startedAt, HostName.getLocalhost(), clusterHostnames); service = new ScheduledThreadPoolExecutor(1, r -> new Thread(r, name() + "-worker")); service.scheduleAtFixedRate(this, initialDelay.toMillis(), interval.toMillis(), TimeUnit.MILLISECONDS); jobControl.started(name(), this); diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java index dcf45ee9da0..291268a416f 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java @@ -2,6 +2,8 @@ package com.yahoo.concurrent.maintenance; import java.time.Duration; +import java.time.Instant; +import java.util.List; /** * @author mpolden @@ -13,7 +15,7 @@ class TestMaintainer extends Maintainer { private RuntimeException exceptionToThrow = null; public TestMaintainer(String name, Mode mode, JobControl jobControl, JobMetrics jobMetrics) { - super(name, mode, Duration.ofDays(1), Duration.ofDays(1), jobControl, jobMetrics); + super(name, mode, Duration.ofDays(1), Instant.now(), jobControl, jobMetrics, List.of()); } public int totalRuns() { |