GC unused code, as we will never look back.

3 files changed, 3 insertions, 7 deletions

diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def
index cfd59cf8400..799490ba114 100644
--- a/storage/src/vespa/storage/config/stor-communicationmanager.def
+++ b/storage/src/vespa/storage/config/stor-communicationmanager.def
@@ -58,6 +58,7 @@ skip_thread bool default=false
 
 ## Whether to use direct P2P RPC protocol for all StorageAPI communication
 ## instead of going via MessageBus.
+## Deprecated, and will soon be gone as it is default on.
 use_direct_storageapi_rpc bool default=true
 
 ## The number of network (FNET) threads used by the shared rpc resource.
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 6021673d472..25942926155 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -270,8 +270,7 @@ CommunicationManager::CommunicationManager(StorageComponentRegister& compReg, co
       _closed(false),
       _docApiConverter(configUri, std::make_shared<PlaceHolderBucketResolver>()),
       _thread(),
-      _skip_thread(false),
-      _use_direct_storageapi_rpc(false)
+      _skip_thread(false)
 {
     _component.registerMetricUpdateHook(*this, framework::SecondTime(5));
     _component.registerMetric(_metrics);
@@ -375,7 +374,6 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig>
 {
     // Only allow dynamic (live) reconfiguration of message bus limits.
     _skip_thread = config->skipThread;
-    _use_direct_storageapi_rpc = config->useDirectStorageapiRpc;
     if (_mbus) {
         configureMessageBusLimits(*config);
         if (_mbus->getRPCNetwork().getPort() != config->mbusport) {
@@ -574,9 +572,7 @@ CommunicationManager::sendCommand(
         case api::StorageMessageAddress::Protocol::STORAGE:
     {
         LOG(debug, "Send to %s: %s", address.toString().c_str(), msg->toString().c_str());
-        if (_use_direct_storageapi_rpc.load(std::memory_order_relaxed) &&
-            _storage_api_rpc_service->target_supports_direct_rpc(address))
-        {
+        if (_storage_api_rpc_service->target_supports_direct_rpc(address)) {
             _storage_api_rpc_service->send_rpc_v1_request(msg);
         } else {
             auto cmd = std::make_unique<mbusprot::StorageCommand>(msg);
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.h b/storage/src/vespa/storage/storageserver/communicationmanager.h
index db88f95af6d..5a828e49678 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.h
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.h
@@ -119,7 +119,6 @@ private:
     DocumentApiConverter  _docApiConverter;
     framework::Thread::UP _thread;
     std::atomic<bool>     _skip_thread;
-    std::atomic<bool>     _use_direct_storageapi_rpc;
 
     void updateMetrics(const MetricLockGuard &) override;
     void enqueue_or_process(std::shared_ptr<api::StorageMessage> msg);