Avoid using void skip thread config.

5 files changed, 0 insertions, 22 deletions

diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
index df0827e78c9..95c63f56bac 100644
--- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
+++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp
@@ -21,14 +21,11 @@
 #include <vespa/searchcore/bmcluster/spi_bm_feed_handler.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <getopt.h>
 #include <filesystem>
 #include <iostream>
-#include <thread>
-#include <unistd.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("vespa-feed-bm");
@@ -229,7 +226,6 @@ App::usage()
         "[--rpc-events-before-wakeup events]\n"
         "[--rpc-network-threads threads]\n"
         "[--rpc-targets-per-node targets]\n"
-        "[--skip-communicationmanager-thread]\n"
         "[--skip-get-spi-bucket-info]\n"
         "[--update-passes update-passes]\n"
         "[--use-async-message-handling]\n"
@@ -261,7 +257,6 @@ App::get_options(int argc, char **argv)
         { "rpc-events-before-wakeup", 1, nullptr, 0 },
         { "rpc-network-threads", 1, nullptr, 0 },
         { "rpc-targets-per-node", 1, nullptr, 0 },
-        { "skip-communicationmanager-thread", 0, nullptr, 0 },
         { "skip-get-spi-bucket-info", 0, nullptr, 0 },
         { "update-passes", 1, nullptr, 0 },
         { "use-async-message-handling", 0, nullptr, 0 },
@@ -288,7 +283,6 @@ App::get_options(int argc, char **argv)
         LONGOPT_RPC_EVENTS_BEFORE_WAKEUP,
         LONGOPT_RPC_NETWORK_THREADS,
         LONGOPT_RPC_TARGETS_PER_NODE,
-        LONGOPT_SKIP_COMMUNICATIONMANAGER_THREAD,
         LONGOPT_SKIP_GET_SPI_BUCKET_INFO,
         LONGOPT_UPDATE_PASSES,
         LONGOPT_USE_ASYNC_MESSAGE_HANDLING,
@@ -355,9 +349,6 @@ App::get_options(int argc, char **argv)
             case LONGOPT_RPC_TARGETS_PER_NODE:
                 _bm_params.set_rpc_targets_per_node(atoi(optarg));
                 break;
-            case LONGOPT_SKIP_COMMUNICATIONMANAGER_THREAD:
-                _bm_params.set_skip_communicationmanager_thread(true);
-                break;
             case LONGOPT_SKIP_GET_SPI_BUCKET_INFO:
                 _bm_params.set_skip_get_spi_bucket_info(true);
                 break;
diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
index f22e817b72c..7d190a81087 100644
--- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
+++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
@@ -23,7 +23,6 @@
 #include <vespa/searchcore/bmcluster/spi_bm_feed_handler.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/lambdatask.h>
 #include <vespa/vespalib/util/size_literals.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
@@ -31,7 +30,6 @@
 #include <filesystem>
 #include <iostream>
 #include <thread>
-#include <unistd.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("vespa-redistribute-bm");
@@ -491,7 +489,6 @@ App::usage()
         "[--rpc-network-threads threads]\n"
         "[--rpc-targets-per-node targets]\n"
         "[--response-threads threads]\n"
-        "[--skip-communicationmanager-thread]\n"
         "[--use-async-message-handling]\n"
         "[--use-feed-settle]" << std::endl;
 }
@@ -526,7 +523,6 @@ App::get_options(int argc, char **argv)
         { "rpc-events-before-wakeup", 1, nullptr, 0 },
         { "rpc-network-threads", 1, nullptr, 0 },
         { "rpc-targets-per-node", 1, nullptr, 0 },
-        { "skip-communicationmanager-thread", 0, nullptr, 0 },
         { "use-async-message-handling", 0, nullptr, 0 },
         { "use-feed-settle", 0, nullptr, 0 },
         { nullptr, 0, nullptr, 0 }
@@ -556,7 +552,6 @@ App::get_options(int argc, char **argv)
         LONGOPT_RPC_EVENTS_BEFORE_WAKEUP,
         LONGOPT_RPC_NETWORK_THREADS,
         LONGOPT_RPC_TARGETS_PER_NODE,
-        LONGOPT_SKIP_COMMUNICATIONMANAGER_THREAD,
         LONGOPT_USE_ASYNC_MESSAGE_HANDLING,
         LONGOPT_USE_FEED_SETTLE
     };
@@ -643,9 +638,6 @@ App::get_options(int argc, char **argv)
             case LONGOPT_RPC_TARGETS_PER_NODE:
                 _bm_params.set_rpc_targets_per_node(atoi(optarg));
                 break;
-            case LONGOPT_SKIP_COMMUNICATIONMANAGER_THREAD:
-                _bm_params.set_skip_communicationmanager_thread(true);
-                break;
             case LONGOPT_USE_ASYNC_MESSAGE_HANDLING:
                 _bm_params.set_use_async_message_handling_on_schedule(true);
                 break;
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
index 3ff10b19164..23118aab630 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
@@ -27,7 +27,6 @@ BmClusterParams::BmClusterParams()
       _rpc_events_before_wakeup(1), // Same default as in stor-communicationmanager.def
       _rpc_network_threads(1),      // Same default as previous in stor-communicationmanager.def
       _rpc_targets_per_node(1),     // Same default as in stor-communicationmanager.def
-      _skip_communicationmanager_thread(false), // Same default as in stor-communicationmanager.def
       _skip_get_spi_bucket_info(false),
       _use_async_message_handling_on_schedule(false),
       _use_document_api(false),
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
index d365a28b0b6..06734e3ee86 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
@@ -34,7 +34,6 @@ class BmClusterParams
     uint32_t _rpc_events_before_wakeup;
     uint32_t _rpc_network_threads;
     uint32_t _rpc_targets_per_node;
-    bool     _skip_communicationmanager_thread;
     bool     _skip_get_spi_bucket_info;
     bool     _use_async_message_handling_on_schedule;
     bool     _use_document_api;
@@ -64,7 +63,6 @@ public:
     uint32_t get_rpc_events_before_wakeup() const { return _rpc_events_before_wakeup; }
     uint32_t get_rpc_network_threads() const { return _rpc_network_threads; }
     uint32_t get_rpc_targets_per_node() const { return _rpc_targets_per_node; }
-    bool get_skip_communicationmanager_thread() const { return _skip_communicationmanager_thread; }
     bool get_skip_get_spi_bucket_info() const { return _skip_get_spi_bucket_info; }
     bool get_use_async_message_handling_on_schedule() const { return _use_async_message_handling_on_schedule; }
     bool get_use_document_api() const { return _use_document_api; }
@@ -93,7 +91,6 @@ public:
     void set_rpc_events_before_wakeup(uint32_t value) { _rpc_events_before_wakeup = value; }
     void set_rpc_network_threads(uint32_t threads_in) { _rpc_network_threads = threads_in; }
     void set_rpc_targets_per_node(uint32_t targets_in) { _rpc_targets_per_node = targets_in; }
-    void set_skip_communicationmanager_thread(bool value) { _skip_communicationmanager_thread = value; }
     void set_skip_get_spi_bucket_info(bool value) { _skip_get_spi_bucket_info = value; }
     void set_use_async_message_handling_on_schedule(bool value) { _use_async_message_handling_on_schedule = value; }
     void set_use_document_api(bool value) { _use_document_api = value; }
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index d1910087371..b18ea6dd89d 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -333,7 +333,6 @@ struct StorageConfigSet
         }
         stor_communicationmanager.mbusport = mbus_port;
         stor_communicationmanager.rpcport = rpc_port;
-        stor_communicationmanager.skipThread = params.get_skip_communicationmanager_thread();
 
         stor_status.httpport = status_port;
         make_bucketspaces_config(bucketspaces);