Add reindexing progress to deployment metrics

5 files changed, 68 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java
index 062a21b1f80..cdfdce91500 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/DeploymentMetricsResponse.java
@@ -40,6 +40,11 @@ public class DeploymentMetricsResponse extends SlimeJsonResponse {
                 metrics.setDouble("diskUtil", disk.util());
                 metrics.setDouble("diskFeedBlockLimit", disk.feedBlockLimit());
             });
+
+            aggregator.reindexingProgress().ifPresent(reindexingProgress -> {
+                Cursor progressObject = cluster.setObject("reindexingProgress");
+                reindexingProgress.forEach(progressObject::setDouble);
+            });
         }
     }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
index d406cafc3b8..77e2f923d4a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java
@@ -148,6 +148,10 @@ public class ClusterDeploymentMetricsRetriever {
                                         values.field("cluster-controller.resource_usage.memory_limit.last").asDouble())
                                 .addDiskUsage(values.field("cluster-controller.resource_usage.max_disk_utilization.last").asDouble(),
                                         values.field("cluster-controller.resource_usage.disk_limit.last").asDouble()));
+                optionalDouble(values.field("reindexing.progress.last")).ifPresent(progress -> {
+                    if (progress < 0 || progress >= 1) return;
+                    aggregator.get().addReindexingProgress(metric.field("dimensions").field("documenttype").asString(), progress);
+                });
                 break;
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsAggregator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsAggregator.java
index f27cf942dd8..7ce6d84ad8c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsAggregator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsAggregator.java
@@ -1,6 +1,8 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.metrics;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -15,6 +17,7 @@ public class DeploymentMetricsAggregator {
     private Double documentCount;
     private ResourceUsage memoryUsage;
     private ResourceUsage diskUsage;
+    private Map<String, Double> reindexingProgress;
 
     public synchronized DeploymentMetricsAggregator addFeedLatency(double sum, double count) {
         this.feed = combineLatency(this.feed, sum, count);
@@ -46,6 +49,12 @@ public class DeploymentMetricsAggregator {
         return this;
     }
 
+    public synchronized DeploymentMetricsAggregator addReindexingProgress(String documentType, double progress) {
+        if (reindexingProgress == null) this.reindexingProgress = new HashMap<>();
+        this.reindexingProgress.put(documentType, progress);
+        return this;
+    }
+
     public Optional<Double> aggregateFeedLatency() {
         return Optional.ofNullable(feed).map(m -> m.sum / m.count).filter(num -> !num.isNaN());
     }
@@ -80,6 +89,10 @@ public class DeploymentMetricsAggregator {
         return Optional.ofNullable(diskUsage);
     }
 
+    public Optional<Map<String, Double>> reindexingProgress() {
+        return Optional.ofNullable(reindexingProgress);
+    }
+
 
     private static LatencyMetrics combineLatency(LatencyMetrics metricsOrNull, double sum, double count) {
         return Optional.ofNullable(metricsOrNull).orElseGet(LatencyMetrics::new).combine(sum, count);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
index 7fdfbcdbf03..b5bcae65009 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetrieverTest.java
@@ -70,7 +70,9 @@ public class ClusterDeploymentMetricsRetrieverTest {
                 new DeploymentMetricsAggregator()
                         .addDocumentCount(6000.0)
                         .addMemoryUsage(0.89074, 0.8)
-                        .addDiskUsage(0.83517, 0.75),
+                        .addDiskUsage(0.83517, 0.75)
+                        .addReindexingProgress("test_artifacts", 0.71)
+                        .addReindexingProgress("announcements", 0),
                 aggregatorMap.get(expectedContentCluster)
         );
 
@@ -113,6 +115,7 @@ public class ClusterDeploymentMetricsRetrieverTest {
         compareOptionals(expected.diskUsage(), actual.diskUsage(), (a, b) -> assertDoubles.accept(a.feedBlockLimit(), b.feedBlockLimit()));
         compareOptionals(expected.memoryUsage(), actual.memoryUsage(), (a, b) -> assertDoubles.accept(a.util(), b.util()));
         compareOptionals(expected.memoryUsage(), actual.memoryUsage(), (a, b) -> assertDoubles.accept(a.feedBlockLimit(), b.feedBlockLimit()));
+        assertEquals(expected.reindexingProgress(), actual.reindexingProgress());
     }
 
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
diff --git a/configserver/src/test/resources/metrics/clustercontroller_metrics.json b/configserver/src/test/resources/metrics/clustercontroller_metrics.json
index 9afcb34d77d..65468749940 100644
--- a/configserver/src/test/resources/metrics/clustercontroller_metrics.json
+++ b/configserver/src/test/resources/metrics/clustercontroller_metrics.json
@@ -20,6 +20,48 @@
         },
         {
           "values": {
+            "reindexing.progress.last": 0.71
+          },
+          "dimensions": {
+            "clustertype": "content",
+            "clusterid": "content_cluster_id",
+            "documenttype": "test_artifacts"
+          }
+        },
+        {
+          "values": {
+            "reindexing.progress.last": 1
+          },
+          "dimensions": {
+            "clustertype": "content",
+            "clusterid": "content_cluster_id",
+            "documenttype": "builds"
+          }
+        },
+        {
+          "values": {
+            "reindexing.progress.last": 0
+          },
+          "dimensions": {
+            "clustertype": "content",
+            "clusterid": "content_cluster_id",
+            "documenttype": "announcements",
+            "state": "running"
+          }
+        },
+        {
+          "values": {
+            "reindexing.progress.last": -1
+          },
+          "dimensions": {
+            "clustertype": "content",
+            "clusterid": "content_cluster_id",
+            "documenttype": "announcements",
+            "state": "successful"
+          }
+        },
+        {
+          "values": {
             "some.other.metrics": 1
           },
           "dimensions": {