diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-11-19 10:52:20 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-11-19 11:04:46 +0100 |
| commit | efee08d9b656445ddd13c31c14394e6031654047 (patch) | |
| tree | be098845bee5668acf87b6ae2e177e28007b3f2a /clustercontroller-reindexer | |
| parent | bf81e897a3dd05b1e0934d6234f5a9bf0ad9a150 (diff) | |
Metric "reindexing.progress" with value [0, 1] instead of percentage
Diffstat (limited to 'clustercontroller-reindexer')
| -rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java | 5 | ||||
| -rw-r--r-- | clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java index 5a5a866f153..b109d60572e 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java @@ -26,8 +26,9 @@ class ReindexingMetrics { void dump(Reindexing reindexing) { reindexing.status().forEach((type, status) -> { - metric.set("reindexing.percent.done", - status.progress().map(ProgressToken::percentFinished).orElse(status.state() == SUCCESSFUL ? 100.0 : 0.0), + metric.set("reindexing.progress", + status.progress().map(ProgressToken::percentFinished).map(percentage -> percentage * 1e-2) + .orElse(status.state() == SUCCESSFUL ? 1.0 : 0.0), metric.createContext(Map.of("clusterid", cluster, "documenttype", type.getName(), "state", toString(status.state())))); diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java index 9e3992c4d0f..2fb7ad799ff 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java @@ -103,10 +103,10 @@ class ReindexerTest { new Reindexer(cluster, Map.of(music, Instant.EPOCH), database, failIfCalled, metric, clock).reindex(); Reindexing reindexing = Reindexing.empty().with(music, Status.ready(Instant.EPOCH).running().successful(Instant.EPOCH)); assertEquals(reindexing, database.readReindexing()); - assertEquals(Map.of("reindexing.percent.done", Map.of(Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "successful"), - 100.0)), + assertEquals(Map.of("reindexing.progress", Map.of(Map.of("documenttype", "music", + "clusterid", "cluster", + "state", "successful"), + 1.0)), metric.metrics()); // New config tells reindexer to reindex "music" documents no earlier than at 10 millis after EPOCH, which isn't yet. @@ -146,10 +146,10 @@ class ReindexerTest { reindexing = reindexing.with(music, Status.ready(clock.instant()).running().progressed(new ProgressToken()).halted()); assertEquals(reindexing, database.readReindexing()); assertTrue(shutDown.get(), "Session was shut down"); - assertEquals(Map.of("reindexing.percent.done", Map.of(Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "ready"), - 100.0)), // new ProgressToken() is 100% done. + assertEquals(Map.of("reindexing.progress", Map.of(Map.of("documenttype", "music", + "clusterid", "cluster", + "state", "ready"), + 1.0)), // new ProgressToken() is 100% done. metric.metrics()); // Last reindexing fails. |