Always clear_bucket_priority_on_schedule.

2 files changed, 0 insertions, 39 deletions

diff --git a/storage/src/tests/distributor/distributor_stripe_test.cpp b/storage/src/tests/distributor/distributor_stripe_test.cpp
index 302ed6d2d9b..5ae19088bfb 100644
--- a/storage/src/tests/distributor/distributor_stripe_test.cpp
+++ b/storage/src/tests/distributor/distributor_stripe_test.cpp
@@ -172,12 +172,6 @@ struct DistributorStripeTest : Test, DistributorStripeTestUtil {
         });
     }
 
-    void configure_implicitly_clear_priority_on_schedule(bool implicitly_clear) {
-        configure_stripe_with([&](auto& builder) {
-            builder.implicitlyClearBucketPriorityOnSchedule = implicitly_clear;
-        });
-    }
-
     void configure_use_unordered_merge_chaining(bool use_unordered) {
         configure_stripe_with([&](auto& builder) {
             builder.useUnorderedMergeChaining = use_unordered;
@@ -202,10 +196,6 @@ struct DistributorStripeTest : Test, DistributorStripeTestUtil {
         });
     }
 
-    [[nodiscard]] bool scheduler_has_implicitly_clear_priority_on_schedule_set() const noexcept {
-        return _stripe->_scheduler->implicitly_clear_priority_on_schedule();
-    }
-
     [[nodiscard]] bool distributor_owns_bucket_in_current_and_pending_states(document::BucketId bucket_id) const {
         return (getDistributorBucketSpace().get_bucket_ownership_flags(bucket_id).owned_in_pending_state() &&
                 getDistributorBucketSpace().check_ownership_in_pending_and_current_state(bucket_id).isOwned());
@@ -903,17 +893,6 @@ TEST_F(DistributorStripeTest, max_activation_inhibited_out_of_sync_groups_config
     EXPECT_EQ(getConfig().max_activation_inhibited_out_of_sync_groups(), 0);
 }
 
-TEST_F(DistributorStripeTest, implicitly_clear_priority_on_schedule_config_is_propagated_to_scheduler)
-{
-    setup_stripe(Redundancy(1), NodeCount(1), "distributor:1 storage:1");
-
-    configure_implicitly_clear_priority_on_schedule(true);
-    EXPECT_TRUE(scheduler_has_implicitly_clear_priority_on_schedule_set());
-
-    configure_implicitly_clear_priority_on_schedule(false);
-    EXPECT_FALSE(scheduler_has_implicitly_clear_priority_on_schedule_set());
-}
-
 TEST_F(DistributorStripeTest, wanted_split_bit_count_is_lower_bounded)
 {
     setup_stripe(Redundancy(1), NodeCount(1), "distributor:1 storage:1");
diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp
index 461ad725574..f4bd9989869 100644
--- a/storage/src/tests/distributor/maintenanceschedulertest.cpp
+++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp
@@ -4,9 +4,6 @@
 #include <vespa/storage/distributor/maintenance/maintenancescheduler.h>
 #include <tests/distributor/maintenancemocks.h>
 #include <vespa/vespalib/gtest/gtest.h>
-#include <memory>
-#include <string>
-#include <sstream>
 
 using document::test::makeDocumentBucket;
 using namespace ::testing;
@@ -31,10 +28,6 @@ struct MaintenanceSchedulerTest : TestWithParam<bool> {
           _pending_window_checker(),
           _scheduler(_operation_generator, _priority_db, _pending_window_checker, _operation_starter)
     {}
-
-    void SetUp() override {
-        _scheduler.set_implicitly_clear_priority_on_schedule(GetParam());
-    }
 };
 
 TEST_P(MaintenanceSchedulerTest, priority_cleared_after_scheduled) {
@@ -80,17 +73,6 @@ TEST_P(MaintenanceSchedulerTest, suppress_low_priorities_in_emergency_mode) {
               _priority_db.toString());
 }
 
-TEST_P(MaintenanceSchedulerTest, priority_not_cleared_if_operation_not_started) {
-    if (GetParam()) {
-        return; // Only works when implicit clearing is NOT enabled
-    }
-    _priority_db.setPriority(PrioritizedBucket(makeDocumentBucket(BucketId(16, 1)), Priority::HIGH));
-    _operation_starter.setShouldStartOperations(false);
-    WaitTimeMs waitMs(_scheduler.tick(MaintenanceScheduler::NORMAL_SCHEDULING_MODE));
-    EXPECT_EQ(WaitTimeMs(1), waitMs);
-    EXPECT_EQ("PrioritizedBucket(Bucket(BucketSpace(0x0000000000000001), BucketId(0x4000000000000001)), pri HIGH)\n",
-              _priority_db.toString());
-}
 
 TEST_P(MaintenanceSchedulerTest, priority_cleared_if_operation_not_started_inside_pending_window) {
     if (!GetParam()) {