From f60935d45bd01a0e0edfa5dc605936ad96f88aaa Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 20 Mar 2019 19:11:12 +0100 Subject: Soft timeout is now default in backend. No need to send down properties anymore. --- .../src/main/java/com/yahoo/search/query/ranking/SoftTimeout.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'container-search/src/main/java/com/yahoo/search/query/ranking') 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) -- cgit v1.2.3