diff options
Diffstat (limited to 'storage/src/tests/distributor/statecheckerstest.cpp')
| -rw-r--r-- | storage/src/tests/distributor/statecheckerstest.cpp | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp index a0d45292c1d..ad9a1598788 100644 --- a/storage/src/tests/distributor/statecheckerstest.cpp +++ b/storage/src/tests/distributor/statecheckerstest.cpp @@ -12,6 +12,8 @@ #include <vespa/storage/distributor/distributor_stripe.h> #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h> #include <vespa/storage/distributor/statecheckers.h> +#include <vespa/storage/config/distributorconfiguration.h> +#include <vespa/storage/config/config-stor-distributormanager.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/stat.h> #include <vespa/vdslib/distribution/distribution.h> @@ -59,12 +61,7 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { const std::vector<uint16_t>& expected) { auto& distributorBucketSpace(getIdealStateManager().getBucketSpaceRepo().get(makeBucketSpace())); - std::vector<uint16_t> idealNodes( - distributorBucketSpace - .getDistribution().getIdealStorageNodes( - distributorBucketSpace.getClusterState(), - bucket, - "ui")); + std::vector<uint16_t> idealNodes(distributorBucketSpace.getDistribution().getIdealStorageNodes(distributorBucketSpace.getClusterState(), bucket, "ui")); ASSERT_EQ(expected, idealNodes); } @@ -168,13 +165,9 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { static const PendingMessage NO_OP_BLOCKER; const PendingMessage* _blockerMessage {&NO_OP_BLOCKER}; uint32_t _redundancy {2}; - uint32_t _splitCount {0}; - uint32_t _splitSize {0}; - uint32_t _minSplitBits {0}; bool _includeMessagePriority {false}; bool _includeSchedulingPriority {false}; bool _merge_operations_disabled {false}; - bool _config_enable_default_space_merge_inhibition {false}; bool _merges_inhibited_in_bucket_space {false}; CheckerParams(); ~CheckerParams(); @@ -195,10 +188,6 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { _pending_cluster_state = state; return *this; } - CheckerParams& blockerMessage(const PendingMessage& blocker) { - _blockerMessage = &blocker; - return *this; - } CheckerParams& redundancy(uint32_t r) { _redundancy = r; return *this; @@ -219,10 +208,6 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { _bucket_space = bucket_space; return *this; } - CheckerParams& config_enable_default_space_merge_inhibition(bool enabled) noexcept { - _config_enable_default_space_merge_inhibition = enabled; - return *this; - } CheckerParams& merges_inhibited_in_bucket_space(bool inhibited) noexcept { _merges_inhibited_in_bucket_space = inhibited; return *this; @@ -238,9 +223,8 @@ struct StateCheckersTest : Test, DistributorStripeTestUtil { addNodesToBucketDB(bucket, params._bucketInfo); set_redundancy(params._redundancy); enable_cluster_state(params._clusterState); - vespa::config::content::core::StorDistributormanagerConfigBuilder config; + DistributorManagerConfig config; config.mergeOperationsDisabled = params._merge_operations_disabled; - config.inhibitDefaultMergesWhenGlobalMergesPending = params._config_enable_default_space_merge_inhibition; configure_stripe(config); if (!params._pending_cluster_state.empty()) { simulate_set_pending_cluster_state(params._pending_cluster_state); @@ -824,20 +808,6 @@ TEST_F(StateCheckersTest, no_merge_operation_generated_if_merges_inhibited_in_de CheckerParams() .expect("NO OPERATIONS GENERATED") // Would normally generate a merge op .bucketInfo("0=1,2=2") - .config_enable_default_space_merge_inhibition(true) - .merges_inhibited_in_bucket_space(true) - .clusterState("distributor:1 storage:3")); -} - -TEST_F(StateCheckersTest, merge_operation_still_generated_if_merges_inhibited_in_default_bucket_space_but_config_disallowed) { - runAndVerify<SynchronizeAndMoveStateChecker>( - CheckerParams() - .expect("[Moving bucket to ideal node 1]" - "[Synchronizing buckets with different checksums " - "node(idx=0,crc=0x1,docs=1/1,bytes=1/1,trusted=false,active=false,ready=false), " - "node(idx=2,crc=0x2,docs=2/2,bytes=2/2,trusted=false,active=false,ready=false)]") - .bucketInfo("0=1,2=2") - .config_enable_default_space_merge_inhibition(false) .merges_inhibited_in_bucket_space(true) .clusterState("distributor:1 storage:3")); } |