diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-03-21 10:33:38 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-03-21 10:33:38 +0000 |
commit | ed80025577f072d31f3d3f8825c0e2112cf1d67d (patch) | |
tree | 77796c6a5cfb300628a2ee2eeeed591fba82858b /searchcore | |
parent | db9aff7fd0015b37b9cb034c6c798e90f231fa5f (diff) |
Hardwire matchengine to always be online.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/matchengine/matchengine.cpp | 3 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp index 9ae938981a4..fefb5257868 100644 --- a/searchcore/src/tests/proton/matchengine/matchengine.cpp +++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp @@ -190,8 +190,7 @@ TEST("requireThatStateIsReported") EXPECT_EQUAL( "{\n" " \"status\": {\n" - " \"state\": \"OFFLINE\",\n" - " \"message\": \"Search interface is offline\"\n" + " \"state\": \"ONLINE\"\n" " }\n" "}\n", slime.toString()); diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp index 8fcb30a4143..17303f631b5 100644 --- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp @@ -45,7 +45,7 @@ MatchEngine::MatchEngine(size_t numThreads, size_t threadsPerSearch, uint32_t di _handlers(), _executor(std::max(size_t(1), numThreads / threadsPerSearch), 256 * 1024), _threadBundlePool(std::max(size_t(1), threadsPerSearch)), - _nodeUp(false) + _nodeUp(true) { // empty } @@ -151,7 +151,7 @@ bool MatchEngine::isOnline() const { void MatchEngine::setNodeUp(bool nodeUp) { - _nodeUp = nodeUp; + _nodeUp = nodeUp || true; } |