diff options
author | jonmv <venstad@gmail.com> | 2022-08-08 14:23:30 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-08-08 14:23:30 +0200 |
commit | 45ba5edcb10593ee172f35a70037e08e00e0bacf (patch) | |
tree | 9ff5753a7ddc0c05c6c8171e3e20d2862ef0cbac | |
parent | 22e1362b6f26beef6b1e424240af22f39b94fc60 (diff) |
Remove "state" dimension from reindexing metrics
-rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java | 22 | ||||
-rw-r--r-- | clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java | 20 |
2 files changed, 4 insertions, 38 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 8a48e4ce272..a1aa5287d2f 100644 --- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java +++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMetrics.java @@ -27,31 +27,11 @@ class ReindexingMetrics { void dump(Reindexing reindexing) { reindexing.status().forEach((type, status) -> { - Reindexing.State state = status.state(); 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(state)))); - // Set metric value to -1 for all states not currently active, so we only have one value >= 0 at any given time. - for (Reindexing.State unset : EnumSet.complementOf(EnumSet.of(state))) - metric.set("reindexing.progress", - -1, - metric.createContext(Map.of("clusterid", cluster, - "documenttype", type.getName(), - "state", toString(unset)))); + metric.createContext(Map.of("clusterid", cluster, "documenttype", type.getName()))); }); } - private static String toString(Reindexing.State state) { - switch (state) { - case READY: return "pending"; - case RUNNING: return "running"; - case FAILED: return "failed"; - case SUCCESSFUL: return "successful"; - default: throw new IllegalArgumentException("Unknown reindexing state '" + 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 1bab8f6ee27..dffe1dd43ef 100644 --- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java +++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java @@ -121,21 +121,8 @@ class ReindexerTest { assertEquals(reindexing, database.readReindexing("cluster")); assertTrue(shutDown.get(), "Session was shut down"); assertEquals(Map.of("reindexing.progress", Map.of(Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "successful"), - 1.0, - Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "pending"), - -1.0, - Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "failed"), - -1.0, - Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "running"), - -1.0)), + "clusterid", "cluster"), + 1.0)), metric.metrics()); // One more reindexing, this time shut down before visit completes, but after progress is reported. @@ -159,8 +146,7 @@ class ReindexerTest { assertEquals(1.0, // new ProgressToken() is 100% done. metric.metrics().get("reindexing.progress") .get(Map.of("documenttype", "music", - "clusterid", "cluster", - "state", "pending"))); + "clusterid", "cluster"))); // Reindexer is created without any ready document types, which means nothing should run. new Reindexer(cluster, triggers(), database, ReindexerTest::failIfCalled, metric, clock).reindex(); |