Merge pull request #30158 from vespa-engine/balder/disable_queue_limits_for_chained_merges-always-true

disable_queue_limits_for_chained_merges has long been true, GC

4 files changed, 0 insertions, 19 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 444c1157cc4..6a11bbcc3f1 100644
--- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
+++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp
@@ -505,7 +505,6 @@ App::get_options(int argc, char **argv)
         { "documents", 1, nullptr, 0 },
         { "flip-nodes", 1, nullptr, 0 },
         { "groups", 1, nullptr, 0 },
-        { "ignore-merge-queue-limit", 0, nullptr, 0 },
         { "indexing-sequencer", 1, nullptr, 0 },
         { "max-merges-per-node", 1, nullptr, 0 },
         { "max-merge-queue-size", 1, nullptr, 0 },
@@ -533,7 +532,6 @@ App::get_options(int argc, char **argv)
         LONGOPT_DOCUMENTS,
         LONGOPT_FLIP_NODES,
         LONGOPT_GROUPS,
-        LONGOPT_IGNORE_MERGE_QUEUE_LIMIT,
         LONGOPT_INDEXING_SEQUENCER,
         LONGOPT_MAX_MERGES_PER_NODE,
         LONGOPT_MAX_MERGE_QUEUE_SIZE,
@@ -582,9 +580,6 @@ App::get_options(int argc, char **argv)
             case LONGOPT_GROUPS:
                 _bm_params.set_groups(atoi(optarg));
                 break;
-            case LONGOPT_IGNORE_MERGE_QUEUE_LIMIT:
-                _bm_params.set_disable_queue_limits_for_chained_merges(true);
-                break;
             case LONGOPT_INDEXING_SEQUENCER:
                 _bm_params.set_indexing_sequencer(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 12f90523760..5b5a25fa00d 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.cpp
@@ -7,7 +7,6 @@ namespace search::bmcluster {
 
 BmClusterParams::BmClusterParams()
     : _bucket_db_stripe_bits(4),
-      _disable_queue_limits_for_chained_merges(false), // Same default as in stor-server.def
       _distributor_merge_busy_wait(10), // Same default as stor_distributormanager.def
       _distributor_stripes(0),
       _doc_store_chunk_compression_level(9), // Same default as in proton.def
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
index 585d6426b87..9c2329dbbf9 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster_params.h
@@ -14,7 +14,6 @@ namespace search::bmcluster {
 class BmClusterParams
 {
     uint32_t _bucket_db_stripe_bits;
-    bool     _disable_queue_limits_for_chained_merges;
     uint32_t _distributor_merge_busy_wait;
     uint32_t _distributor_stripes;
     uint32_t _doc_store_chunk_compression_level;
@@ -43,7 +42,6 @@ public:
     BmClusterParams();
     ~BmClusterParams();
     uint32_t get_bucket_db_stripe_bits() const { return _bucket_db_stripe_bits; }
-    bool get_disable_queue_limits_for_chained_merges() const noexcept { return _disable_queue_limits_for_chained_merges; }
     uint32_t get_distributor_merge_busy_wait() const { return _distributor_merge_busy_wait; }
     uint32_t get_distributor_stripes() const { return _distributor_stripes; }
     uint32_t get_doc_store_chunk_compression_level() const noexcept { return _doc_store_chunk_compression_level; }
@@ -70,7 +68,6 @@ public:
     bool needs_message_bus() const { return _use_message_bus || _use_document_api; }
     bool needs_service_layer() const { return _enable_service_layer || _enable_distributor || _use_storage_chain || _use_message_bus || _use_document_api; }
     void set_bucket_db_stripe_bits(uint32_t value) { _bucket_db_stripe_bits = value; }
-    void set_disable_queue_limits_for_chained_merges(bool value) { _disable_queue_limits_for_chained_merges = value; }
     void set_distributor_merge_busy_wait(uint32_t value) { _distributor_merge_busy_wait = value; }
     void set_distributor_stripes(uint32_t value) { _distributor_stripes = value; }
     void set_doc_store_chunk_compression_level(uint32_t value) { _doc_store_chunk_compression_level = value; }
diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
index 9bc9a47c59d..d47f6d68e3b 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
+++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp
@@ -31,36 +31,27 @@
 #include <vespa/searchlib/transactionlog/translogserver.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/storage/common/i_storage_chain_builder.h>
-#include <vespa/storage/config/config-stor-bouncer.h>
-#include <vespa/storage/config/config-stor-communicationmanager.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
 #include <vespa/storage/config/config-stor-prioritymapping.h>
-#include <vespa/storage/config/config-stor-server.h>
 #include <vespa/storage/config/config-stor-status.h>
 #include <vespa/storage/config/config-stor-visitordispatcher.h>
 #include <vespa/storage/distributor/bucket_spaces_stats_provider.h>
 #include <vespa/storage/storageserver/mergethrottler.h>
 #include <vespa/storage/storageserver/rpc/shared_rpc_resources.h>
-#include <vespa/storage/visiting/config-stor-visitor.h>
 #include <vespa/storageserver/app/distributorprocess.h>
 #include <vespa/storageserver/app/servicelayerprocess.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/config-attributes.h>
 #include <vespa/config-bucketspaces.h>
 #include <vespa/config-imported-fields.h>
 #include <vespa/config-indexschema.h>
-#include <vespa/config-persistence.h>
 #include <vespa/config-rank-profiles.h>
 #include <vespa/config-slobroks.h>
-#include <vespa/config-stor-distribution.h>
-#include <vespa/config-stor-filestor.h>
 #include <vespa/config-summary.h>
 #include <vespa/config-upgrading.h>
 #include <vespa/config/common/configcontext.h>
 #include <vespa/document/bucket/bucketspace.h>
-#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>
@@ -299,7 +290,6 @@ struct StorageConfigSet
           messagebus()
     {
         stor_distribution = distribution.get_distribution_config();
-        stor_server.disableQueueLimitsForChainedMerges = params.get_disable_queue_limits_for_chained_merges();
         stor_server.nodeIndex = node_idx;
         stor_server.isDistributor = distributor;
         stor_server.contentNodeBucketDbStripeBits = params.get_bucket_db_stripe_bits();