diff options
Diffstat (limited to 'configserver/src')
5 files changed, 27 insertions, 37 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java index 58d2e6a2c90..47bfc3662b5 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java @@ -33,7 +33,7 @@ public class SecretStoreValidator { private static final String PROTOCOL = "http://"; private static final String AWS_PARAMETER_VALIDATION_HANDLER_POSTFIX = ":4080/validate-secret-store"; private final SecretStore secretStore; - private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient(); + private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient();; public SecretStoreValidator(SecretStore secretStore) { this.secretStore = secretStore; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java index 9821cbe9c15..a7f4ef5d513 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java @@ -24,8 +24,9 @@ public class SimpleHttpFetcher implements HttpFetcher { private final CloseableHttpClient client; - public SimpleHttpFetcher(Duration connectTimeout) { this(connectTimeout, null); } - + public SimpleHttpFetcher(Duration connectTimeout) { + this(connectTimeout, null); + } public SimpleHttpFetcher(Duration connectTimeout, NodeHostnameVerifier verifier) { VespaHttpClientBuilder builder = VespaHttpClientBuilder.custom().connectTimeout(Timeout.of(connectTimeout)); if (verifier != null) { 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 c9a03e362ee..61c0c17264c 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 @@ -126,31 +126,22 @@ public class ClusterDeploymentMetricsRetriever { Supplier<DeploymentMetricsAggregator> aggregator = () -> clusterMetricsMap.computeIfAbsent(clusterInfo, c -> new DeploymentMetricsAggregator()); switch (serviceName) { - case VESPA_CONTAINER: + case VESPA_CONTAINER -> { optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> - aggregator.get() - .addContainerLatency(qlSum, values.field("query_latency.count").asDouble())); + aggregator.get().addContainerLatency(qlSum, values.field("query_latency.count").asDouble())); optionalDouble(values.field("feed.latency.sum")).ifPresent(flSum -> - aggregator.get() - .addFeedLatency(flSum, values.field("feed.latency.count").asDouble())); - break; - case VESPA_QRSERVER: - optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> - aggregator.get() - .addQrLatency(qlSum, values.field("query_latency.count").asDouble())); - break; - case VESPA_DISTRIBUTOR: - optionalDouble(values.field("vds.distributor.docsstored.average")) - .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); - break; - case VESPA_CONTAINER_CLUSTERCONTROLLER: - optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil -> - aggregator.get() - .addMemoryUsage(memoryUtil, - values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble()) - .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(), - values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble())); - break; + aggregator.get().addFeedLatency(flSum, values.field("feed.latency.count").asDouble())); + } + case VESPA_QRSERVER -> optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> + aggregator.get().addQrLatency(qlSum, values.field("query_latency.count").asDouble())); + case VESPA_DISTRIBUTOR -> optionalDouble(values.field("vds.distributor.docsstored.average")) + .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount)); + case VESPA_CONTAINER_CLUSTERCONTROLLER -> + optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil -> + aggregator.get() + .addMemoryUsage(memoryUtil, values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble()) + .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(), + values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble())); } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java index 5f3711e43b6..c137b80e951 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java @@ -26,15 +26,12 @@ public class ClusterProtonMetricsRetriever { private static final Logger log = Logger.getLogger(ClusterProtonMetricsRetriever.class.getName()); - private static final CloseableHttpClient httpClient = - VespaHttpClientBuilder - .custom() - .connectTimeout(Timeout.ofSeconds(10)) - .apacheBuilder() - .setDefaultRequestConfig(RequestConfig.custom() - .setResponseTimeout(Timeout.ofSeconds(10)) - .build()) - .build(); + private static final CloseableHttpClient httpClient = VespaHttpClientBuilder + .custom() + .connectTimeout(Timeout.ofSeconds(10)) + .apacheBuilder() + .setDefaultRequestConfig(RequestConfig.custom().setResponseTimeout(Timeout.ofSeconds(10)).build()) + .build(); public Map<String, ProtonMetricsAggregator> requestMetricsGroupedByCluster(Collection<URI> hosts) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java b/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java index 60a9dbc96db..4378c4cbd47 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/PortRangeAllocator.java @@ -5,9 +5,10 @@ import com.google.common.collect.ContiguousSet; import com.google.common.collect.DiscreteDomain; import com.google.common.collect.Range; +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashSet; import java.util.Set; -import java.util.Stack; /** * Allocates port ranges for all configserver tests. @@ -28,7 +29,7 @@ public class PortRangeAllocator { private static class PortRange { private final Set<Integer> takenPorts = new HashSet<>(); - private final Stack<Integer> freePorts = new Stack<>(); + private final Deque<Integer> freePorts = new ArrayDeque<>(); private static final int first = 18651; private static final int last = 18899; // see: factory/doc/port-ranges |