diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-02-16 18:42:12 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-02-19 17:40:10 +0100 |
commit | 3de6d8a5af2a9400b3f47da1fd2372056494504d (patch) | |
tree | de7a86f6fc6c129422a69dc54e7a9eafc1d0c5a2 | |
parent | 5254e4a91f40886364c2929e81f55e1e1200554c (diff) |
Non-functional changes
7 files changed, 10 insertions, 9 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java index 0bffdc9b735..83463cca2cc 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java @@ -1,7 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.api; -import com.yahoo.config.provision.*; +import com.yahoo.config.provision.Capacity; +import com.yahoo.config.provision.ClusterSpec; +import com.yahoo.config.provision.HostSpec; +import com.yahoo.config.provision.ProvisionLogger; import java.util.List; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index f27c84d19c3..ea84c72e16c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -441,7 +441,7 @@ public class ContentCluster extends AbstractConfigProducer implements private ContentCluster(AbstractConfigProducer<?> parent, String clusterId, Map<String, NewDocumentType> documentDefinitions, Set<NewDocumentType> globallyDistributedDocuments, - String routingSelection, Zone zone, boolean isHosted) { + String routingSelection, Zone zone, boolean isHosted) { super(parent, clusterId); this.isHosted = isHosted; this.clusterId = clusterId; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java index 91ad413adb3..7367850bb42 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java @@ -126,11 +126,11 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { /** Returns the memory we can expect will be available for the content node processes */ private double usableMemoryGb() { double usableMemoryGb = resources.memoryGb() - reservedMemoryGb; - if (!combined) { + if ( ! combined) { return usableMemoryGb; } - double fractionTakenByContainer = (double)ApplicationContainerCluster.heapSizePercentageOfTotalNodeMemoryWhenCombinedCluster / 100; + double fractionTakenByContainer = ApplicationContainerCluster.heapSizePercentageOfTotalNodeMemoryWhenCombinedCluster * 1e-2; return usableMemoryGb * (1 - fractionTakenByContainer); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java index 1a1cd243f89..a2786c3bc87 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import java.util.Optional; - /** * A capacity request. * diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java index d8959abf37b..5c6effced93 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.stream.Collectors; /** - * Represents the resources allocated to a deployment at specific point in time. + * Represents the resources allocated to a deployment at a specific point in time. * * @author olaa */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java index 5f36499426b..073d1799d3e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java @@ -57,7 +57,7 @@ public class BufferedLogStore { long lastChunkId = buffer.getLogChunkIds(id, type).max().orElse(0); long numberOfChunks = Math.max(1, buffer.getLogChunkIds(id, type).count()); if (numberOfChunks > maxLogSize / chunkSize) - return; // Max size exceeded — store no more. + return; // Max size exceeded — store no more. byte[] emptyChunk = "[]".getBytes(); byte[] lastChunk = buffer.readLog(id, type, lastChunkId).orElse(emptyChunk); diff --git a/document/abi-spec.json b/document/abi-spec.json index 1b3ca23c0bc..88b9fef86cb 100644 --- a/document/abi-spec.json +++ b/document/abi-spec.json @@ -4473,4 +4473,4 @@ "protected com.yahoo.document.update.ValueUpdate$ValueUpdateClassID valueUpdateClassID" ] } -} +}
\ No newline at end of file |