diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2023-03-21 11:39:17 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2023-03-21 11:39:17 +0100 |
| commit | 298dc193826defb9067bbb58ec2cf89ffc280e3c (patch) | |
| tree | 9fb8e332399083c880b624c942b9d99164677dc0 /container-core | |
| parent | 01d979598823255af37bd3dde53bea888e31d7b3 (diff) | |
Disallow incremental non-exclusive container allocation
Disallow shared allocation of containers also when there is
an existing non-exclusive host which can fit the requested node.
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java | 2 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/processing/request/Properties.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java index c443c387381..27c33d07928 100644 --- a/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java +++ b/container-core/src/main/java/com/yahoo/metrics/ContainerMetrics.java @@ -122,7 +122,7 @@ public enum ContainerMetrics implements VespaMetrics { QUERIES("queries", Unit.OPERATION, "Query volume"), QUERY_CONTAINER_LATENCY("query_container_latency", Unit.MILLISECOND, "The query execution time consumed in the container"), QUERY_LATENCY("query_latency", Unit.MILLISECOND, "The overall query latency as seen by the container"), - QUERY_TIMEOUT("query_timeout", Unit.MILLISECOND, "The amount of time allowed for query execytion, from the client"), + QUERY_TIMEOUT("query_timeout", Unit.MILLISECOND, "The amount of time allowed for query execution, from the client"), FAILED_QUERIES("failed_queries", Unit.OPERATION, "The number of failed queries"), DEGRADED_QUERIES("degraded_queries", Unit.OPERATION, "The number of degraded queries, e.g. due to some conent nodes not responding in time"), HITS_PER_QUERY("hits_per_query", Unit.HIT_PER_QUERY, "The number of hits returned"), diff --git a/container-core/src/main/java/com/yahoo/processing/request/Properties.java b/container-core/src/main/java/com/yahoo/processing/request/Properties.java index ac43f99472e..060916a0298 100644 --- a/container-core/src/main/java/com/yahoo/processing/request/Properties.java +++ b/container-core/src/main/java/com/yahoo/processing/request/Properties.java @@ -265,7 +265,7 @@ public class Properties implements Cloneable { /** * Sets all properties having this name as a compound prefix to null. - * I.e clearAll("a") will clear the value of "a" and "a.b" but not "ab". + * I.e. clearAll("a") will clear the value of "a" and "a.b" but not "ab". * * @param name the compound prefix of the properties to clear * @throws RuntimeException if no instance in the chain accepted this name-value pair |