diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-30 15:01:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-30 15:01:39 +0200 |
commit | 61fea291708fb74113d5f98480a628b0bc7695f3 (patch) | |
tree | 91fd393a4678cedb1e7edbc589a78b0eeb61755a /searchcore | |
parent | 4e4ec099edd99775066ab416b35d6716479e3dde (diff) | |
parent | 082ed671d24b1197580bc265712ae9821a65e481 (diff) |
Merge pull request #10804 from vespa-engine/balder/remove-leftover-fs4-code
Balder/remove leftover fs4 code
Diffstat (limited to 'searchcore')
4 files changed, 3 insertions, 25 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index fe7a7616c18..596635a416a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -8,7 +8,6 @@ #include "matcher.h" #include "sessionmanager.h" #include <vespa/searchcore/grouping/groupingcontext.h> -#include <vespa/searchlib/engine/errorcodes.h> #include <vespa/searchlib/engine/docsumrequest.h> #include <vespa/searchlib/engine/searchrequest.h> #include <vespa/searchlib/engine/searchreply.h> @@ -214,8 +213,6 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl metaStore, *feature_overrides); traceQuery(6, request.trace(), mtf->query()); if (!mtf->valid()) { - reply->errorCode = ECODE_QUERY_PARSE_ERROR; - reply->errorMessage = "query execution failed (invalid query)"; return reply; } diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 0a49f494406..a8f5cb32375 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -23,6 +23,7 @@ #include <vespa/searchcore/proton/matchengine/matchengine.h> #include <vespa/searchlib/transactionlog/trans_log_server_explorer.h> #include <vespa/searchlib/util/fileheadertk.h> +#include <vespa/searchlib/common/packets.h> #include <vespa/document/base/exceptions.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/repo/documenttyperepo.h> @@ -30,7 +31,6 @@ #include <vespa/vespalib/util/lambdatask.h> #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/util/random.h> -#include <vespa/searchlib/engine/transportserver.h> #include <vespa/vespalib/net/state_server.h> #include <vespa/searchlib/aggregation/forcelink.hpp> @@ -203,7 +203,6 @@ Proton::Proton(const config::ConfigUri & configUri, _customComponentBindToken(), _customComponentRootToken(), _stateServer(), - _fs4Server(), // This executor can only have 1 thread as it is used for // serializing startup. _executor(1, 128 * 1024), @@ -289,9 +288,6 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) _tls->start(); _flushEngine = std::make_unique<FlushEngine>(std::make_shared<flushengine::TlsStatsFactory>(_tls->getTransLogServer()), strategy, flush.maxconcurrent, flush.idleinterval*1000); - _fs4Server = std::make_unique<TransportServer>(*_matchEngine, *_summaryEngine, *this, protonConfig.ptport, TransportServer::DEBUG_ALL); - _fs4Server->setTCPNoDelay(true); - _metricsEngine->addExternalMetrics(_fs4Server->getMetrics()); _metricsEngine->addExternalMetrics(_summaryEngine->getMetrics()); char tmp[1024]; @@ -333,11 +329,7 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) waitForOnlineState(); _isReplayDone = true; _rpcHooks->set_online(); - if ( ! _fs4Server->start() ) { - throw vespalib::PortListenException(protonConfig.ptport, "FS4"); - } - int port = _fs4Server->getListenPort(); - LOG(debug, "Started fs4 interface on port %d", port); + _flushEngine->start(); _isInitializing = false; _protonConfigurer.setAllowReconfig(true); @@ -445,13 +437,7 @@ Proton::~Proton() if (_sharedExecutor) { _sharedExecutor->sync(); } - LOG(debug, "Shutting down fs4 interface"); - if (_metricsEngine && _fs4Server) { - _metricsEngine->removeExternalMetrics(_fs4Server->getMetrics()); - } - if (_fs4Server) { - _fs4Server->shutDown(); - } + if ( ! _documentDBMap.empty()) { size_t numCores = 4; const std::shared_ptr<proton::ProtonConfigSnapshot> pcsp = _protonConfigurer.getActiveConfigSnapshot(); diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index fe7e8fe2219..487a596e7e6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -29,8 +29,6 @@ #include <mutex> #include <shared_mutex> -namespace search::engine { class TransportServer; } - namespace vespalib { class StateServer; } namespace proton { @@ -54,7 +52,6 @@ class Proton : public IProtonConfigurerOwner, { private: typedef search::transactionlog::TransLogServerApp TLS; - using TransportServer = search::engine::TransportServer; typedef search::engine::MonitorRequest MonitorRequest; typedef search::engine::MonitorReply MonitorReply; typedef search::engine::MonitorClient MonitorClient; @@ -109,7 +106,6 @@ private: vespalib::JsonHandlerRepo::Token::UP _customComponentBindToken; vespalib::JsonHandlerRepo::Token::UP _customComponentRootToken; std::unique_ptr<vespalib::StateServer> _stateServer; - std::unique_ptr<TransportServer> _fs4Server; vespalib::ThreadStackExecutor _executor; std::unique_ptr<IProtonDiskLayout> _protonDiskLayout; ProtonConfigurer _protonConfigurer; diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h index 78e3c5d3f3c..d8dc3d5f4db 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h @@ -7,7 +7,6 @@ #include <vespa/vespalib/util/closure.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/threadstackexecutor.h> -#include <vespa/searchlib/common/packets.h> #include <vespa/searchlib/engine/proto_rpc_adapter.h> #include <mutex> #include <condition_variable> |