GC maxpendingidealstateoperations which has not been wired in for a long time.

4 files changed, 0 insertions, 10 deletions

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 859fc407945..d0b1d69ba47 100644
--- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
+++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
@@ -1,6 +1,5 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/document/config/documenttypes_config_fwd.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -540,7 +539,6 @@ App::get_options(int argc, char **argv)
         LONGOPT_MAX_MERGES_PER_NODE,
         LONGOPT_MAX_MERGE_QUEUE_SIZE,
         LONGOPT_MAX_PENDING,
-        LONGOPT_MAX_PENDING_IDEALSTATE_OPERATIONS,
         LONGOPT_MBUS_DISTRIBUTOR_NODE_MAX_PENDING_COUNT,
         LONGOPT_MODE,
         LONGOPT_NODES_PER_GROUP,
@@ -600,9 +598,6 @@ App::get_options(int argc, char **argv)
             case LONGOPT_MAX_PENDING:
                 _bm_params.set_max_pending(atoi(optarg));
                 break;
-            case LONGOPT_MAX_PENDING_IDEALSTATE_OPERATIONS:
-                _bm_params.set_max_pending_idealstate_operations(atoi(optarg));
-                break;
             case LONGOPT_MBUS_DISTRIBUTOR_NODE_MAX_PENDING_COUNT:
                 _bm_params.set_mbus_distributor_node_max_pending_count(atoi(optarg));
                 break;
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
index 0310bdc7319..12f90523760 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
@@ -18,7 +18,6 @@ BmClusterParams::BmClusterParams()
       _indexing_sequencer(),
       _max_merges_per_node(16),     // Same default as in stor-server.def
       _max_merge_queue_size(1024),  // Same default as in stor-server.def
-      _max_pending_idealstate_operations(100), // Same default as in stor-distributormanager.def
       _mbus_distributor_node_max_pending_count(),
       _num_nodes(1),
       _nodes_per_group(1),
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
index 13cd9e31604..585d6426b87 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
@@ -25,7 +25,6 @@ class BmClusterParams
     vespalib::string _indexing_sequencer;
     uint32_t _max_merges_per_node;
     uint32_t _max_merge_queue_size;
-    uint32_t _max_pending_idealstate_operations;
     std::optional<uint32_t> _mbus_distributor_node_max_pending_count;
     uint32_t _num_nodes;
     uint32_t _nodes_per_group;
@@ -54,7 +53,6 @@ public:
     const vespalib::string & get_indexing_sequencer() const { return _indexing_sequencer; }
     uint32_t get_max_merges_per_node() const noexcept { return _max_merges_per_node; }
     uint32_t get_max_merge_queue_size() const noexcept { return _max_merge_queue_size; }
-    uint32_t get_max_pending_idealstate_operations() const noexcept { return _max_pending_idealstate_operations; }
     const std::optional<uint32_t>& get_mbus_distributor_node_max_pending_count() const noexcept { return _mbus_distributor_node_max_pending_count; }
     uint32_t get_nodes_per_group() const noexcept { return _nodes_per_group; }
     uint32_t get_num_nodes() const { return _num_nodes; }
@@ -83,7 +81,6 @@ public:
     void set_indexing_sequencer(vespalib::stringref sequencer) { _indexing_sequencer = sequencer; }
     void set_max_merges_per_node(uint32_t value) { _max_merges_per_node = value; }
     void set_max_merge_queue_size(uint32_t value) { _max_merge_queue_size = value; }
-    void set_max_pending_idealstate_operations(uint32_t value) { _max_pending_idealstate_operations = value; }
     void set_mbus_distributor_node_max_pending_count(int32_t value) { _mbus_distributor_node_max_pending_count = value; }
     void set_nodes_per_group(uint32_t value);
     void set_redundancy(uint32_t value) { _redundancy = value; }
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index ede5728026e..9bc9a47c59d 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -386,7 +386,6 @@ struct DistributorConfigSet : public StorageConfigSet
           stor_visitordispatcher()
     {
         stor_distributormanager.inhibitMergeSendingOnBusyNodeDurationSec = params.get_distributor_merge_busy_wait();
-        stor_distributormanager.maxpendingidealstateoperations = params.get_max_pending_idealstate_operations();
         stor_distributormanager.numDistributorStripes = params.get_distributor_stripes();
     }