diff options
Diffstat (limited to 'storage/src/tests/distributor/statecheckerstest.cpp')
| -rw-r--r-- | storage/src/tests/distributor/statecheckerstest.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp index 0f48440b5a1..a0d45292c1d 100644 --- a/storage/src/tests/distributor/statecheckerstest.cpp +++ b/storage/src/tests/distributor/statecheckerstest.cpp @@ -16,7 +16,6 @@ #include <vespa/storageapi/message/stat.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vespalib/gtest/gtest.h> -#include <gmock/gmock.h> using document::test::makeBucketSpace; using document::test::makeDocumentBucket; @@ -175,7 +174,6 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { bool _includeMessagePriority {false}; bool _includeSchedulingPriority {false}; bool _merge_operations_disabled {false}; - bool _prioritize_global_bucket_merges {true}; bool _config_enable_default_space_merge_inhibition {false}; bool _merges_inhibited_in_bucket_space {false}; CheckerParams(); @@ -217,10 +215,6 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { _merge_operations_disabled = disabled; return *this; } - CheckerParams& prioritize_global_bucket_merges(bool enabled) noexcept { - _prioritize_global_bucket_merges = enabled; - return *this; - } CheckerParams& bucket_space(document::BucketSpace bucket_space) noexcept { _bucket_space = bucket_space; return *this; @@ -246,7 +240,6 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { enable_cluster_state(params._clusterState); vespa::config::content::core::StorDistributormanagerConfigBuilder config; config.mergeOperationsDisabled = params._merge_operations_disabled; - config.prioritizeGlobalBucketMerges = params._prioritize_global_bucket_merges; config.inhibitDefaultMergesWhenGlobalMergesPending = params._config_enable_default_space_merge_inhibition; configure_stripe(config); if (!params._pending_cluster_state.empty()) { @@ -734,7 +727,7 @@ TEST_F(StateCheckersTest, synchronize_and_move) { .clusterState("distributor:1 storage:4")); } -TEST_F(StateCheckersTest, global_bucket_merges_have_very_high_priority_if_prioritization_enabled) { +TEST_F(StateCheckersTest, global_bucket_merges_have_very_high_priority) { runAndVerify<SynchronizeAndMoveStateChecker>( CheckerParams().expect( "[Synchronizing buckets with different checksums " @@ -745,23 +738,7 @@ TEST_F(StateCheckersTest, global_bucket_merges_have_very_high_priority_if_priori .bucketInfo("0=1,1=2") .bucket_space(document::FixedBucketSpaces::global_space()) .includeSchedulingPriority(true) - .includeMessagePriority(true) - .prioritize_global_bucket_merges(true)); -} - -TEST_F(StateCheckersTest, global_bucket_merges_have_normal_priority_if_prioritization_disabled) { - runAndVerify<SynchronizeAndMoveStateChecker>( - CheckerParams().expect( - "[Synchronizing buckets with different checksums " - "node(idx=0,crc=0x1,docs=1/1,bytes=1/1,trusted=false,active=false,ready=false), " - "node(idx=1,crc=0x2,docs=2/2,bytes=2/2,trusted=false,active=false,ready=false)] " - "(pri 120) " - "(scheduling pri MEDIUM)") - .bucketInfo("0=1,1=2") - .bucket_space(document::FixedBucketSpaces::global_space()) - .includeSchedulingPriority(true) - .includeMessagePriority(true) - .prioritize_global_bucket_merges(false)); + .includeMessagePriority(true)); } // Upon entering a cluster state transition edge the distributor will |