summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/query/ranking
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-20 19:11:12 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-03-20 19:11:12 +0100
commitf60935d45bd01a0e0edfa5dc605936ad96f88aaa (patch)
tree818104eaddfcddf670be976232ed6df1c6a393fc /container-search/src/main/java/com/yahoo/search/query/ranking
parent484c21d1f176e60aef41cf336004e41b9160f174 (diff)
Soft timeout is now default in backend. No need to send down properties anymore.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/ranking')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java b/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
index 5132d954687..05cbed6b6d9 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java
@@ -69,9 +69,8 @@ public class SoftTimeout implements Cloneable {
/** Internal operation - DO NOT USE */
public void prepare(RankProperties rankProperties) {
- if ( !enabled) return;
-
- rankProperties.put("vespa.softtimeout.enable", "true");
+ if ( !enabled)
+ rankProperties.put("vespa.softtimeout.enable", "false");
if (factor != null)
rankProperties.put("vespa.softtimeout.factor", String.valueOf(factor));
if (tailcost != null)