diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-01-14 21:18:47 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-01-14 21:18:47 +0100 |
| commit | 998cee45777d01b23aa8cacefb29f0a8f424edc6 (patch) | |
| tree | c04177fa778b03eb06c7ccfd91f67868477b2322 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java | |
| parent | 1e57b906a0ed44a8d745030842a482f2347fe1b5 (diff) | |
Update reindexing status clients in controller, and trigger only for indexed
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java index 848426b6581..3c22ee3f4c3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ReindexingTriggererTest.java @@ -50,8 +50,7 @@ public class ReindexingTriggererTest { public void testReindexingIsReady() { Instant then = Instant.now(); ApplicationReindexing reindexing = new ApplicationReindexing(true, - new Status(then), - Map.of()); + Map.of("c", new Cluster(Map.of(), Map.of("d", new Status(then))))); Instant now = then; assertFalse("Should not be ready less than one half-period after last triggering", @@ -66,20 +65,16 @@ public class ReindexingTriggererTest { reindexingIsReady(reindexing, now)); reindexing = new ApplicationReindexing(true, - new Status(then), Map.of("cluster", - new Cluster(new Status(then), - Map.of(), + new Cluster(Map.of(), Map.of("type", new Status(then, then, null, null, null, null))))); assertFalse("Should not be ready when reindexing is already running", reindexingIsReady(reindexing, now)); reindexing = new ApplicationReindexing(true, - new Status(then), Map.of("cluster", - new Cluster(new Status(then), - Map.of("type", 123L), + new Cluster(Map.of("type", 123L), Map.of("type", new Status(then, then, now, null, null, null))))); assertTrue("Should be ready when reindexing is no longer running", |