Merge pull request #30145 from vespa-engine/balder/gc-maxpendingidealstateoperations

GC maxpendingidealstateoperations which has not been wired in for a l…

4 files changed, 2 insertions, 11 deletions

diff --git a/storage/src/tests/distributor/top_level_distributor_test.cpp b/storage/src/tests/distributor/top_level_distributor_test.cpp
index f8c1b64fc3c..8463e0b548c 100644
--- a/storage/src/tests/distributor/top_level_distributor_test.cpp
+++ b/storage/src/tests/distributor/top_level_distributor_test.cpp
@@ -291,7 +291,6 @@ TEST_F(TopLevelDistributorTest, metric_update_hook_updates_pending_maintenance_m
     setup_distributor(Redundancy(2), NodeCount(2), "storage:2 distributor:1");
     // To ensure we count all operations, not just those fitting within the pending window.
     auto cfg = current_distributor_config();
-    cfg.maxpendingidealstateoperations = 1; // FIXME STRIPE this does not actually seem to be used...!
     reconfigure(cfg);
 
     // 1 bucket must be merged, 1 must be split, 1 should be activated.
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp
index e386ac3583c..a06ff241ee3 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.cpp
+++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp
@@ -22,7 +22,6 @@ DistributorConfiguration::DistributorConfiguration(StorageComponent& component)
       _byteCountJoinLimit(0),
       _docCountJoinLimit(0),
       _minimalBucketSplit(16),
-      _maxIdealStateOperations(100),
       _maxNodesPerMerge(16),
       _max_consecutively_inhibited_maintenance_ticks(20),
       _max_activation_inhibited_out_of_sync_groups(0),
@@ -118,7 +117,6 @@ DistributorConfiguration::configure(const DistributorManagerConfig & config)
         throw vespalib::IllegalArgumentException(ost.str(), VESPA_STRLOC);
     }
     
-    _maxIdealStateOperations = config.maxpendingidealstateoperations;
     _byteCountSplitLimit = config.splitsize;
     _docCountSplitLimit = config.splitcount;
     _byteCountJoinLimit = config.joinsize;
@@ -172,16 +170,14 @@ DistributorConfiguration::configure(const DistributorManagerConfig & config)
     LOG(debug,
         "Distributor now using new configuration parameters. Split limits: %d docs/%d bytes. "
         "Join limits: %d docs/%d bytes. Minimal bucket split %d. "
-        "Documents to garbage collect: %s (check every %d seconds). "
-        "Maximum pending ideal state operations: %d",
+        "Documents to garbage collect: %s (check every %d seconds). ",
         (int)_docCountSplitLimit,
         (int)_byteCountSplitLimit,
         (int)_docCountJoinLimit,
         (int)_byteCountJoinLimit,
         (int)_minimalBucketSplit,
         _garbageCollectionSelection.c_str(),
-        (int)vespalib::to_s(_garbageCollectionInterval),
-        (int)_maxIdealStateOperations);
+        (int)vespalib::to_s(_garbageCollectionInterval));
 }
 
 void 
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h
index 4f561f7df5a..2b78d627b4d 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.h
+++ b/storage/src/vespa/storage/config/distributorconfiguration.h
@@ -264,7 +264,6 @@ private:
     uint32_t _byteCountJoinLimit;
     uint32_t _docCountJoinLimit;
     uint32_t _minimalBucketSplit;
-    uint32_t _maxIdealStateOperations;
     uint32_t _maxNodesPerMerge;
     uint32_t _max_consecutively_inhibited_maintenance_ticks;
     uint32_t _max_activation_inhibited_out_of_sync_groups;
diff --git a/storage/src/vespa/storage/config/stor-distributormanager.def b/storage/src/vespa/storage/config/stor-distributormanager.def
index 06faf96a286..1260350630e 100644
--- a/storage/src/vespa/storage/config/stor-distributormanager.def
+++ b/storage/src/vespa/storage/config/stor-distributormanager.def
@@ -1,9 +1,6 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 namespace=vespa.config.content.core
 
-## Maximum number of ideal state operations scheduled by a distributor.
-maxpendingidealstateoperations int default=100
-
 ## The total size of unique documents in a bucket before we split it due to
 ## being too big. By default this is now 16 MB. Should be kept in sync with stor-filestor.def:bucket_merge_chunk_size.
 splitsize int default=16772216