diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-20 12:31:57 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-20 12:31:57 +0100 |
| commit | 367e964a430c17b730999a743c937deacbd874c8 (patch) | |
| tree | 7b14937f00ace95af34bba0cc0c25859c220657f | |
| parent | 063dcfef8881dbb10775f7f2983a86ccc9b7b9da (diff) | |
Deprecate useLocalNode
The container will figure this out on its own,
and turning this on will make it impossible to query this
cluster from another node.
| -rw-r--r-- | configdefinitions/src/vespa/dispatch.def | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 5f44b677b3b..77f6dffd714 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -27,7 +27,7 @@ maxHitsPerNode int default=2147483647 # Deprecated, will go away soon, NOOP useMultilevelDispatch bool default=false -# Dispatch only to local nodes +# Dispatch only to local nodes. DEPRECATED: The container will automatically do this when it is appropriate. useLocalNode bool default=false # Number of document copies diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java b/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java index 6a59f28ca4c..210ab5777d2 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/LoadBalancer.java @@ -47,7 +47,7 @@ public class LoadBalancer { * {@link #releaseGroup} symmetrically for each taken allocation. * * @param rejectedGroups if not null, the load balancer will only return groups with IDs not in the set - * @return The node group to target, or <i>empty</i> if the internal dispatch logic cannot be used + * @return the node group to target, or <i>empty</i> if the internal dispatch logic cannot be used */ public Optional<Group> takeGroup(Set<Integer> rejectedGroups) { synchronized (this) { @@ -68,12 +68,9 @@ public class LoadBalancer { /** * Release an allocation given by {@link #takeGroup}. The release must be done exactly once for each allocation. * - * @param group - * previously allocated group - * @param success - * was the query successful - * @param searchTimeMs - * query execution time in milliseconds, used for adaptive load balancing + * @param group previously allocated group + * @param success was the query successful + * @param searchTimeMs query execution time in milliseconds, used for adaptive load balancing */ public void releaseGroup(Group group, boolean success, double searchTimeMs) { synchronized (this) { |