summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-11-07 00:21:35 +0100
committerGitHub <noreply@github.com>2018-11-07 00:21:35 +0100
commit9863899ffe849ad7af74759977fbf2640b0add93 (patch)
treed1f64927942a44a26be5c75efd0faa33f701a7db /searchcore
parent0689f93f9750f9d8c0fdbb383388b03c918ce11a (diff)
parent909f7a827deb71e4b7d029a4864ed3730424adcc (diff)
Merge pull request #7587 from vespa-engine/balder/avoid-aritmetic-execption
Ensure that we do not get division by zero by always requiring non-ze…
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
index 16308ed22f9..73b92eaa2b7 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp
@@ -891,7 +891,7 @@ FastS_FNET_Search::CheckCoverage()
}
bool missingReplies = (askedButNotAnswered != 0) || (nodesQueried != nodesReplied);
const ssize_t missingParts = cntNone - (_dataset->getSearchableCopies() - 1);
- if (((missingParts > 0) && (cntNone != _nodes.size())) || (missingReplies && useAdaptiveTimeout())) {
+ if (((missingParts > 0) || (missingReplies && useAdaptiveTimeout())) && (cntNone != _nodes.size())) {
// TODO This is a dirty way of anticipating missing coverage.
// It should be done differently
activeDocs += missingParts * activeDocs/(_nodes.size() - cntNone);