diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-01-08 10:59:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 10:59:04 +0100 |
commit | acde14de1286c4ef663ee5b26be768c46dbdcbbf (patch) | |
tree | ac51923810812a1237d103a376d278280c93a020 /vespajlib/src/test/java/com/yahoo/concurrent/maintenance | |
parent | 55599006c8693209cfb7109329cbaacc56f2fbf1 (diff) |
Revert "Revert "Count lock timeout as unsuccessful run""
Diffstat (limited to 'vespajlib/src/test/java/com/yahoo/concurrent/maintenance')
3 files changed, 21 insertions, 19 deletions
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java index a0ca9b529c5..139a2901cd3 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java @@ -19,8 +19,9 @@ public class JobControlTest { String job1 = "Job1"; String job2 = "Job2"; - TestMaintainer maintainer1 = new TestMaintainer(job1, jobControl); - TestMaintainer maintainer2 = new TestMaintainer(job2, jobControl); + JobMetrics metrics = new JobMetrics((job, instant) -> {}); + TestMaintainer maintainer1 = new TestMaintainer(job1, jobControl, metrics); + TestMaintainer maintainer2 = new TestMaintainer(job2, jobControl, metrics); assertEquals(2, jobControl.jobs().size()); assertTrue(jobControl.jobs().contains(job1)); assertTrue(jobControl.jobs().contains(job2)); @@ -61,7 +62,7 @@ public class JobControlTest { public void testJobControlMayDeactivateJobs() { JobControlStateMock state = new JobControlStateMock(); JobControl jobControl = new JobControl(state); - TestMaintainer mockMaintainer = new TestMaintainer(null, jobControl); + TestMaintainer mockMaintainer = new TestMaintainer(null, jobControl, new JobMetrics((job, instant) -> {})); assertTrue(jobControl.jobs().contains("TestMaintainer")); diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java index 2bfaad894a5..e881d4b3ff6 100644 --- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java +++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java @@ -1,6 +1,7 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.concurrent.maintenance; +import com.google.common.util.concurrent.UncheckedTimeoutException; import org.junit.Test; import java.time.Duration; @@ -15,6 +16,8 @@ import static org.junit.Assert.assertEquals; */ public class MaintainerTest { + private final JobControl jobControl = new JobControl(new JobControlStateMock()); + @Test public void staggering() { List<String> cluster = List.of("cfg1", "cfg2", "cfg3"); @@ -41,7 +44,7 @@ public class MaintainerTest { public void success_metric() { AtomicLong consecutiveFailures = new AtomicLong(); JobMetrics jobMetrics = new JobMetrics((job, count) -> consecutiveFailures.set(count)); - TestMaintainer maintainer = new TestMaintainer(jobMetrics); + TestMaintainer maintainer = new TestMaintainer(null, jobControl, jobMetrics); // Maintainer fails twice in a row maintainer.successOnNextRun(false).run(); @@ -58,12 +61,16 @@ public class MaintainerTest { assertEquals(0, consecutiveFailures.get()); // Maintainer throws - maintainer.throwOnNextRun(true).run(); + maintainer.throwOnNextRun(new RuntimeException()).run(); assertEquals(1, consecutiveFailures.get()); // Maintainer recovers - maintainer.throwOnNextRun(false).run(); + maintainer.throwOnNextRun(null).run(); assertEquals(0, consecutiveFailures.get()); + + // Lock exception is treated as a failure + maintainer.throwOnNextRun(new UncheckedTimeoutException()).run(); + assertEquals(1, consecutiveFailures.get()); } } 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 5eae643fe40..ea32af60208 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 @@ -10,18 +12,10 @@ class TestMaintainer extends Maintainer { private int totalRuns = 0; private boolean success = true; - private boolean throwing = false; + private RuntimeException exceptionToThrow = null; public TestMaintainer(String name, JobControl jobControl, JobMetrics jobMetrics) { - super(name, Duration.ofDays(1), Duration.ofDays(1), jobControl, jobMetrics); - } - - public TestMaintainer(JobMetrics jobMetrics) { - this(null, new JobControl(new JobControlStateMock()), jobMetrics); - } - - public TestMaintainer(String name, JobControl jobControl) { - this(name, jobControl, new JobMetrics((job, instant) -> {})); + super(name, Duration.ofDays(1), Instant.now(), jobControl, jobMetrics, List.of()); } public int totalRuns() { @@ -33,14 +27,14 @@ class TestMaintainer extends Maintainer { return this; } - public TestMaintainer throwOnNextRun(boolean throwing) { - this.throwing = throwing; + public TestMaintainer throwOnNextRun(RuntimeException e) { + this.exceptionToThrow = e; return this; } @Override protected boolean maintain() { - if (throwing) throw new RuntimeException("Maintenance run failed"); + if (exceptionToThrow != null) throw exceptionToThrow; totalRuns++; return success; } |