diff options
Diffstat (limited to 'searchcore')
7 files changed, 3 insertions, 117 deletions
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp index 9a351b56eda..416a25cfb7b 100644 --- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp +++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp @@ -42,8 +42,6 @@ public: fprintf(stderr, "getProtonStatus\n"); fprintf(stderr, "getState\n"); fprintf(stderr, "monitor\n"); - fprintf(stderr, "enableSearching\n"); - fprintf(stderr, "disableSearching\n"); fprintf(stderr, "triggerFlush\n"); fprintf(stderr, "prepareRestart\n"); return 1; @@ -258,11 +256,7 @@ public: bool invoked = false; - if (strcmp(_argv[2], "enableSearching") == 0) { - _req->SetMethodName("proton.enableSearching"); - } else if (strcmp(_argv[2], "disableSearching") == 0) { - _req->SetMethodName("proton.disableSearching"); - } else if (strcmp(_argv[2], "getState") == 0 && + if (strcmp(_argv[2], "getState") == 0 && _argc >= 3) { _req->SetMethodName("pandora.rtc.getState"); diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp index ccae9fa3d4f..9ae938981a4 100644 --- a/searchcore/src/tests/proton/matchengine/matchengine.cpp +++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp @@ -69,7 +69,6 @@ TEST("requireThatSearchesExecute") { int numMatcherThreads = 16; MatchEngine engine(numMatcherThreads, 1, 7); - engine.setOnline(); engine.setNodeUp(true); MySearchHandler::SP handler(new MySearchHandler); @@ -99,7 +98,6 @@ assertSearchReply(MatchEngine & engine, const std::string & searchDocType, size_ TEST("requireThatCorrectHandlerIsUsed") { MatchEngine engine(1, 1, 7); - engine.setOnline(); engine.setNodeUp(true); ISearchHandler::SP h1(new MySearchHandler(2)); ISearchHandler::SP h2(new MySearchHandler(4)); @@ -135,7 +133,6 @@ struct ObserveBundleMatchHandler : MySearchHandler { TEST("requireThatBundlesAreUsed") { MatchEngine engine(15, 5, 7); - engine.setOnline(); engine.setNodeUp(true); ObserveBundleMatchHandler::SP handler(new ObserveBundleMatchHandler()); @@ -153,7 +150,6 @@ TEST("requireThatBundlesAreUsed") TEST("requireThatHandlersCanBeRemoved") { MatchEngine engine(1, 1, 7); - engine.setOnline(); engine.setNodeUp(true); ISearchHandler::SP h(new MySearchHandler(1)); DocTypeName docType("foo"); @@ -171,25 +167,9 @@ TEST("requireThatHandlersCanBeRemoved") EXPECT_TRUE(r.get() == NULL); } -TEST("requireThatEngineCanBeSetOffline") -{ - MatchEngine engine(1, 1, 7); - engine.setNodeUp(true); - engine.setOnline(); - engine.setInService(); - ASSERT_TRUE(engine.isOnline()); - engine.setOffline(); - ASSERT_FALSE(engine.isOnline()); - engine.setOnline(); - ASSERT_TRUE(engine.isOnline()); - engine.setOutOfService(); - ASSERT_FALSE(engine.isOnline()); -} - TEST("requireThatEmptySearchReplyIsReturnedWhenEngineIsClosed") { MatchEngine engine(1, 1, 7); - engine.setOnline(); engine.setNodeUp(true); engine.close(); LocalSearchClient client; diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp index 83466cd51ad..8fcb30a4143 100644 --- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp @@ -45,9 +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)), - _online(false), - _nodeUp(false), - _inService(false) + _nodeUp(false) { // empty } @@ -145,28 +143,8 @@ MatchEngine::performSearch(search::engine::SearchRequest::Source req, client.searchDone(std::move(ret)); } -void MatchEngine::setOnline() -{ - _online = true; -} - -void MatchEngine::setOffline() -{ - _online = false; -} - -void MatchEngine::setInService() -{ - _inService = true; -} - -void MatchEngine::setOutOfService() -{ - _inService = false; -} - bool MatchEngine::isOnline() const { - return _online && _nodeUp && _inService; + return _nodeUp; } diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h index e27f1789ed3..e23a734fc2f 100644 --- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h +++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h @@ -114,26 +114,6 @@ public: void performSearch(search::engine::SearchRequest::Source req, search::engine::SearchClient &client); - /** - * Will enable the search interface. - */ - void setOnline(); - - /** - * Will disable the search interface. - */ - void setOffline(); - - /** - * Allow search interface to be online. - */ - void setOutOfService(); - - /** - * Disallow search interface. - */ - void setInService(); - /** obtain current online status */ bool isOnline() const; diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index a6c2fb730a9..e8ded2eb4d6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -312,8 +312,6 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) throw vespalib::PortListenException(protonConfig.ptport, "FS4"); } int port = _fs4Server->getListenPort(); - _matchEngine->setOnline(); - _matchEngine->setInService(); LOG(debug, "Started fs4 interface on port %d", port); _flushEngine->start(); _isInitializing = false; diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp index b7210988de2..b80e4ff87ea 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp @@ -125,14 +125,6 @@ RPCHooksBase::initRPC() FRT_ReflectionBuilder rb(_orb.get()); //------------------------------------------------------------------------- - rb.DefineMethod("proton.enableSearching", "", "", true, - FRT_METHOD(RPCHooksBase::rpc_enableSearching), this); - rb.MethodDesc("Tell the node to enable searching"); - //------------------------------------------------------------------------- - rb.DefineMethod("proton.disableSearching", "", "", true, - FRT_METHOD(RPCHooksBase::rpc_disableSearching), this); - rb.MethodDesc("Tell the node to disable searching"); - //------------------------------------------------------------------------- rb.DefineMethod("pandora.rtc.getState", "ii", "SSi", true, FRT_METHOD(RPCHooksBase::rpc_GetState), this); rb.MethodDesc("Get the current state of node"); @@ -267,38 +259,6 @@ RPCHooksBase::prepareRestart(FRT_RPCRequest *req) } void -RPCHooksBase::enableSearching(FRT_RPCRequest *req) -{ - _proton.getMatchEngine().setOnline(); - LOG(info, "Searching enabled"); - req->Return(); -} - -void -RPCHooksBase::rpc_enableSearching(FRT_RPCRequest *req) -{ - LOG(info, "RPCHooksBase::rpc_enableSearching"); - req->Detach(); - letProtonDo(makeClosure(this, &RPCHooksBase::enableSearching, req)); -} - -void -RPCHooksBase::disableSearching(FRT_RPCRequest *req) -{ - _proton.getMatchEngine().setOffline(); - LOG(info, "Search disabled"); - req->Return(); -} - -void -RPCHooksBase::rpc_disableSearching(FRT_RPCRequest *req) -{ - LOG(info, "RPCHooksBase::rpc_disableSearching"); - req->Detach(); - letProtonDo(makeClosure(this, &RPCHooksBase::disableSearching, req)); -} - -void RPCHooksBase::rpc_GetState(FRT_RPCRequest *req) { FRT_Values &arg = *req->GetParams(); diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h index 994699ac480..057706e3d97 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h @@ -72,8 +72,6 @@ private: void triggerFlush(FRT_RPCRequest *req); void prepareRestart(FRT_RPCRequest *req); - void enableSearching(FRT_RPCRequest * req); - void disableSearching(FRT_RPCRequest * req); void checkState(StateArg::UP arg); void reportState(Session & session, FRT_RPCRequest * req) __attribute__((noinline)); void getProtonStatus(FRT_RPCRequest * req); @@ -97,8 +95,6 @@ public: virtual ~RPCHooksBase(); void close(); - void rpc_enableSearching(FRT_RPCRequest *req); - void rpc_disableSearching(FRT_RPCRequest *req); void rpc_GetState(FRT_RPCRequest *req); void rpc_GetProtonStatus(FRT_RPCRequest *req); void rpc_getIncrementalState(FRT_RPCRequest *req); |