summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-31 23:02:07 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-31 23:02:07 +0100
commitcb7e356f92a014e67d0a0323171346bb4cd8a87e (patch)
tree5750da55a208debd78158d02a6181abf7c227937 /container-search
parent3f01eefe0d5ef3b288443adb901e8d70dbf20a40 (diff)
When time is up it is up. Especially considering the loop in doPartialFill....
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
index 50d6a524320..52650279ad5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
@@ -391,7 +391,7 @@ public class FastSearcher extends VespaBackEndSearcher {
BasicPacket[] basicPackets;
try {
- basicPackets = channel.receivePackets(Math.max(50, query.getTimeLeft()), 1);
+ basicPackets = channel.receivePackets(query.getTimeLeft(), 1);
} catch (ChannelTimeoutException e) {
return new Result(query,ErrorMessage.createTimeout("Timeout while waiting for " + getName()));
} catch (InvalidChannelException e) {
@@ -472,7 +472,7 @@ public class FastSearcher extends VespaBackEndSearcher {
if (isLoggingFine())
getLogger().finest("Sent " + docsumsPacket + " on " + channel);
if ( ! couldSend) throw new IOException("Could not successfully send GetDocSumsPacket.");
- receivedPackets = channel.receivePackets(Math.max(50, result.getQuery().getTimeLeft()), docsumsPacket.getNumDocsums() + 1);
+ receivedPackets = channel.receivePackets(result.getQuery().getTimeLeft(), docsumsPacket.getNumDocsums() + 1);
if (isLoggingFine())
getLogger().finest("got " + receivedPackets.length + "docsumPackets");