summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-25 18:57:53 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-01-25 18:55:21 +0100
commit35fe745a9137d8e569e8e4cc6e2bd60d35ad6996 (patch)
tree10e99a4cbbe54b3d9d9605c4db07d5381ca96800 /searchcore
parentfbec92be605d144c2f62664618a7e6cecf756bb0 (diff)
Fetch from correct properties
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/matcher.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
index 54c62c261d4..c2d72a9253b 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
@@ -173,10 +173,11 @@ Matcher::create_match_tools_factory(const search::engine::Request &request,
const IDocumentMetaStore &metaStore,
const Properties &feature_overrides) const
{
- bool softTimeoutEnabled = Enabled::lookup(feature_overrides, _rankSetup->getSoftTimeoutEnabled());
+ const Properties & rankProperties = request.propertiesMap.rankProperties();
+ bool softTimeoutEnabled = Enabled::lookup(rankProperties, _rankSetup->getSoftTimeoutEnabled());
double factor = 0.95;
if (softTimeoutEnabled) {
- factor = Factor::lookup(feature_overrides, _stats.softDoomFactor());
+ factor = Factor::lookup(rankProperties, _stats.softDoomFactor());
LOG(info, "Enabling soft-timeout computed factor=%1.3f, used factor=%1.3f", _stats.softDoomFactor(), factor);
}
uint64_t safeLeft = request.getTimeLeft() * factor;