diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-01-09 11:34:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 11:34:51 +0100 |
commit | b07aa340603d3b00298ac90d98b93ab53999debb (patch) | |
tree | e96485875e9dba341b335a35075ca4f645c978b7 /configserver/src | |
parent | d31bca111fca3991acb2de785066d5853065f541 (diff) | |
parent | 0aaf427c8f397bef63c1ae44b41ad7ec21c67e2d (diff) |
Merge pull request #25448 from vespa-engine/freva/reindexing-cause
Add cause to reindexing notification
Diffstat (limited to 'configserver/src')
5 files changed, 1 insertions, 70 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/DeploymentMetricsResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/DeploymentMetricsResponse.java index b2ebcee3a58..cf3ae88272e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/DeploymentMetricsResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/response/DeploymentMetricsResponse.java @@ -40,11 +40,6 @@ 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 19cb31b6575..c1bc1027690 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 @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; /** @@ -152,10 +151,6 @@ public class ClusterDeploymentMetricsRetriever { values.field("cluster-controller.resource_usage.memory_limit.last").asDouble()) .addDiskUsage(values.field("cluster-controller.resource_usage.max_disk_utilization.max").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 ba1dd20bb2c..6e41bea2c64 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,8 +1,6 @@ // Copyright Yahoo. 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; /** @@ -17,7 +15,6 @@ 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); @@ -49,12 +46,6 @@ 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()); } @@ -89,10 +80,6 @@ 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 df52ab624c6..8701bbfdcb2 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 @@ -15,7 +15,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.BiConsumer; -import java.util.stream.Collectors; import java.util.stream.Stream; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; @@ -70,9 +69,7 @@ public class ClusterDeploymentMetricsRetrieverTest { new DeploymentMetricsAggregator() .addDocumentCount(6000.0) .addMemoryUsage(0.89074, 0.8) - .addDiskUsage(0.83517, 0.75) - .addReindexingProgress("test_artifacts", 0.71) - .addReindexingProgress("announcements", 0), + .addDiskUsage(0.83517, 0.75), aggregatorMap.get(expectedContentCluster) ); @@ -115,7 +112,6 @@ 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 c60000b34de..279635ff76f 100644 --- a/configserver/src/test/resources/metrics/clustercontroller_metrics.json +++ b/configserver/src/test/resources/metrics/clustercontroller_metrics.json @@ -20,48 +20,6 @@ }, { "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": { |