Skip to content

Commit

Permalink
Merge pull request #9815 from rabbitmq/remove-classic-mirrored-queues
Browse files Browse the repository at this point in the history
4.0: Remove classic mirrored queues
  • Loading branch information
michaelklishin authored Jun 4, 2024
2 parents 6c86442 + 11a90b9 commit ae31b47
Show file tree
Hide file tree
Showing 98 changed files with 295 additions and 11,386 deletions.
85 changes: 5 additions & 80 deletions deps/rabbit/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ _APP_ENV = """[
]},
{halt_on_upgrade_failure, true},
{ssl_apps, [asn1, crypto, public_key, ssl]},
%% see rabbitmq-server#114
{mirroring_flow_control, true},
{mirroring_sync_batch_size, 4096},
%% classic queue storage implementation version
{classic_queue_default_version, 2},
%% see rabbitmq-server#227 and related tickets.
%% msg_store_credit_disc_bound only takes effect when
%% messages are persisted to the message store. If messages
Expand Down Expand Up @@ -397,7 +396,7 @@ rabbitmq_integration_suite(
additional_beam = [
":test_queue_utils_beam",
],
shard_count = 8,
shard_count = 6,
)

rabbitmq_integration_suite(
Expand Down Expand Up @@ -429,17 +428,6 @@ rabbitmq_integration_suite(
size = "medium",
)

rabbitmq_integration_suite(
name = "dynamic_ha_SUITE",
size = "large",
flaky = True,
shard_count = 20,
sharding_method = "case",
deps = [
"@proper//:erlang_app",
],
)

rabbitmq_integration_suite(
name = "dynamic_qq_SUITE",
size = "large",
Expand All @@ -451,18 +439,6 @@ rabbitmq_integration_suite(
],
)

rabbitmq_integration_suite(
name = "eager_sync_SUITE",
size = "large",
additional_beam = [
":sync_detection_SUITE_beam_files",
],
flaky = True,
shard_count = 5,
sharding_method = "case",
tags = ["classic-queue"],
)

rabbitmq_integration_suite(
name = "feature_flags_SUITE",
size = "large",
Expand Down Expand Up @@ -530,15 +506,6 @@ rabbitmq_integration_suite(
],
)

rabbitmq_integration_suite(
name = "many_node_ha_SUITE",
size = "medium",
additional_beam = [
":test_rabbit_ha_test_consumer_beam",
":test_rabbit_ha_test_producer_beam",
],
)

rabbitmq_integration_suite(
name = "rabbit_message_interceptor_SUITE",
size = "medium",
Expand Down Expand Up @@ -677,7 +644,7 @@ rabbitmq_integration_suite(
rabbitmq_integration_suite(
name = "queue_master_location_SUITE",
size = "large",
shard_count = 3,
shard_count = 2,
)

rabbitmq_integration_suite(
Expand All @@ -686,7 +653,7 @@ rabbitmq_integration_suite(
additional_beam = [
":test_queue_utils_beam",
],
shard_count = 6,
shard_count = 5,
)

rabbitmq_integration_suite(
Expand Down Expand Up @@ -871,16 +838,6 @@ rabbitmq_integration_suite(
size = "medium",
)

rabbitmq_integration_suite(
name = "simple_ha_SUITE",
size = "large",
additional_beam = [
":test_rabbit_ha_test_consumer_beam",
":test_rabbit_ha_test_producer_beam",
],
shard_count = 4,
)

rabbitmq_integration_suite(
name = "single_active_consumer_SUITE",
size = "medium",
Expand All @@ -889,11 +846,6 @@ rabbitmq_integration_suite(
],
)

rabbitmq_integration_suite(
name = "sync_detection_SUITE",
size = "medium",
)

rabbitmq_integration_suite(
name = "term_to_binary_compat_prop_SUITE",
deps = [
Expand Down Expand Up @@ -1018,15 +970,6 @@ rabbitmq_integration_suite(
size = "medium",
)

rabbitmq_suite(
name = "unit_gm_SUITE",
size = "small",
deps = [
"//deps/rabbitmq_ct_helpers:erlang_app",
"@meck//:erlang_app",
],
)

rabbitmq_integration_suite(
name = "unit_log_management_SUITE",
size = "medium",
Expand Down Expand Up @@ -1107,22 +1050,6 @@ rabbitmq_integration_suite(
],
)

rabbitmq_suite(
name = "unit_classic_mirrored_queue_sync_throttling_SUITE",
size = "small",
deps = [
"//deps/rabbit_common:erlang_app",
],
)

rabbitmq_suite(
name = "unit_classic_mirrored_queue_throughput_SUITE",
size = "small",
deps = [
"//deps/rabbit_common:erlang_app",
],
)

rabbitmq_integration_suite(
name = "direct_exchange_routing_v2_SUITE",
size = "medium",
Expand Down Expand Up @@ -1387,8 +1314,6 @@ eunit(
":test_rabbit_auth_backend_context_propagation_mock_beam",
":test_rabbit_dummy_protocol_connection_info_beam",
":test_rabbit_foo_protocol_connection_info_beam",
":test_rabbit_ha_test_consumer_beam",
":test_rabbit_ha_test_producer_beam",
":test_test_util_beam",
":test_test_rabbit_event_handler_beam",
":test_clustering_utils_beam",
Expand Down
5 changes: 2 additions & 3 deletions deps/rabbit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ define PROJECT_ENV
]},
{halt_on_upgrade_failure, true},
{ssl_apps, [asn1, crypto, public_key, ssl]},
%% see rabbitmq-server#114
{mirroring_flow_control, true},
{mirroring_sync_batch_size, 4096},
%% classic queue storage implementation version
{classic_queue_default_version, 2},
%% see rabbitmq-server#227 and related tickets.
%% msg_store_credit_disc_bound only takes effect when
%% messages are persisted to the message store. If messages
Expand Down
Loading

0 comments on commit ae31b47

Please sign in to comment.