Remove TransportServer

2 files changed, 2 insertions, 21 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 0a49f494406..cd1488890fd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -30,7 +30,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 +202,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 +287,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 +328,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 +436,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;