diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-03-22 23:04:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 23:04:31 +0100 |
| commit | 49996514d179ec2cf15d676836f8a4aacb13e48d (patch) | |
| tree | f224237b56ee8b6fe4abaf5f9413248b2e806e52 /container-core | |
| parent | c0e8ae27d4fe623de21586ff711c7bcddeef3026 (diff) | |
Revert "Disallow incremental non-exclusive container allocation"
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 27c33d07928..c443c387381 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 execution, from the client"), + QUERY_TIMEOUT("query_timeout", Unit.MILLISECOND, "The amount of time allowed for query execytion, 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 060916a0298..ac43f99472e 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 |