diff options
author | Geir Storli <geirstorli@yahoo.no> | 2018-03-21 20:56:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-21 20:56:42 +0100 |
commit | 7a118ea9e60dc9e3c7965b4524d9cc8f37cba38c (patch) | |
tree | b8089c4d1fd40296f4e3b2748974b1b6b973f556 /searchcore | |
parent | 4429bacba1f792be0760024f516ac6adbdf155b6 (diff) |
Revert "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, 4 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp index fefb5257868..9ae938981a4 100644 --- a/searchcore/src/tests/proton/matchengine/matchengine.cpp +++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp @@ -190,7 +190,8 @@ TEST("requireThatStateIsReported") EXPECT_EQUAL( "{\n" " \"status\": {\n" - " \"state\": \"ONLINE\"\n" + " \"state\": \"OFFLINE\",\n" + " \"message\": \"Search interface is offline\"\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 17303f631b5..8fcb30a4143 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(true) + _nodeUp(false) { // empty } @@ -151,7 +151,7 @@ bool MatchEngine::isOnline() const { void MatchEngine::setNodeUp(bool nodeUp) { - _nodeUp = nodeUp || true; + _nodeUp = nodeUp; } |