Skip to content

Commit 3bbda5b

Browse files
committed
Remove classic mirror queues
1 parent 6c86442 commit 3bbda5b

File tree

99 files changed

+292
-11414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+292
-11414
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 5 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ _APP_ENV = """[
8787
]},
8888
{halt_on_upgrade_failure, true},
8989
{ssl_apps, [asn1, crypto, public_key, ssl]},
90-
%% see rabbitmq-server#114
91-
{mirroring_flow_control, true},
92-
{mirroring_sync_batch_size, 4096},
90+
%% classic queue storage implementation version
91+
{classic_queue_default_version, 2},
9392
%% see rabbitmq-server#227 and related tickets.
9493
%% msg_store_credit_disc_bound only takes effect when
9594
%% messages are persisted to the message store. If messages
@@ -397,7 +396,7 @@ rabbitmq_integration_suite(
397396
additional_beam = [
398397
":test_queue_utils_beam",
399398
],
400-
shard_count = 8,
399+
shard_count = 6,
401400
)
402401

403402
rabbitmq_integration_suite(
@@ -429,17 +428,6 @@ rabbitmq_integration_suite(
429428
size = "medium",
430429
)
431430

432-
rabbitmq_integration_suite(
433-
name = "dynamic_ha_SUITE",
434-
size = "large",
435-
flaky = True,
436-
shard_count = 20,
437-
sharding_method = "case",
438-
deps = [
439-
"@proper//:erlang_app",
440-
],
441-
)
442-
443431
rabbitmq_integration_suite(
444432
name = "dynamic_qq_SUITE",
445433
size = "large",
@@ -451,18 +439,6 @@ rabbitmq_integration_suite(
451439
],
452440
)
453441

454-
rabbitmq_integration_suite(
455-
name = "eager_sync_SUITE",
456-
size = "large",
457-
additional_beam = [
458-
":sync_detection_SUITE_beam_files",
459-
],
460-
flaky = True,
461-
shard_count = 5,
462-
sharding_method = "case",
463-
tags = ["classic-queue"],
464-
)
465-
466442
rabbitmq_integration_suite(
467443
name = "feature_flags_SUITE",
468444
size = "large",
@@ -530,15 +506,6 @@ rabbitmq_integration_suite(
530506
],
531507
)
532508

533-
rabbitmq_integration_suite(
534-
name = "many_node_ha_SUITE",
535-
size = "medium",
536-
additional_beam = [
537-
":test_rabbit_ha_test_consumer_beam",
538-
":test_rabbit_ha_test_producer_beam",
539-
],
540-
)
541-
542509
rabbitmq_integration_suite(
543510
name = "rabbit_message_interceptor_SUITE",
544511
size = "medium",
@@ -677,7 +644,7 @@ rabbitmq_integration_suite(
677644
rabbitmq_integration_suite(
678645
name = "queue_master_location_SUITE",
679646
size = "large",
680-
shard_count = 3,
647+
shard_count = 2,
681648
)
682649

683650
rabbitmq_integration_suite(
@@ -686,7 +653,7 @@ rabbitmq_integration_suite(
686653
additional_beam = [
687654
":test_queue_utils_beam",
688655
],
689-
shard_count = 6,
656+
shard_count = 5,
690657
)
691658

692659
rabbitmq_integration_suite(
@@ -871,16 +838,6 @@ rabbitmq_integration_suite(
871838
size = "medium",
872839
)
873840

874-
rabbitmq_integration_suite(
875-
name = "simple_ha_SUITE",
876-
size = "large",
877-
additional_beam = [
878-
":test_rabbit_ha_test_consumer_beam",
879-
":test_rabbit_ha_test_producer_beam",
880-
],
881-
shard_count = 4,
882-
)
883-
884841
rabbitmq_integration_suite(
885842
name = "single_active_consumer_SUITE",
886843
size = "medium",
@@ -889,11 +846,6 @@ rabbitmq_integration_suite(
889846
],
890847
)
891848

892-
rabbitmq_integration_suite(
893-
name = "sync_detection_SUITE",
894-
size = "medium",
895-
)
896-
897849
rabbitmq_integration_suite(
898850
name = "term_to_binary_compat_prop_SUITE",
899851
deps = [
@@ -1018,15 +970,6 @@ rabbitmq_integration_suite(
1018970
size = "medium",
1019971
)
1020972

1021-
rabbitmq_suite(
1022-
name = "unit_gm_SUITE",
1023-
size = "small",
1024-
deps = [
1025-
"//deps/rabbitmq_ct_helpers:erlang_app",
1026-
"@meck//:erlang_app",
1027-
],
1028-
)
1029-
1030973
rabbitmq_integration_suite(
1031974
name = "unit_log_management_SUITE",
1032975
size = "medium",
@@ -1107,22 +1050,6 @@ rabbitmq_integration_suite(
11071050
],
11081051
)
11091052

1110-
rabbitmq_suite(
1111-
name = "unit_classic_mirrored_queue_sync_throttling_SUITE",
1112-
size = "small",
1113-
deps = [
1114-
"//deps/rabbit_common:erlang_app",
1115-
],
1116-
)
1117-
1118-
rabbitmq_suite(
1119-
name = "unit_classic_mirrored_queue_throughput_SUITE",
1120-
size = "small",
1121-
deps = [
1122-
"//deps/rabbit_common:erlang_app",
1123-
],
1124-
)
1125-
11261053
rabbitmq_integration_suite(
11271054
name = "direct_exchange_routing_v2_SUITE",
11281055
size = "medium",
@@ -1387,8 +1314,6 @@ eunit(
13871314
":test_rabbit_auth_backend_context_propagation_mock_beam",
13881315
":test_rabbit_dummy_protocol_connection_info_beam",
13891316
":test_rabbit_foo_protocol_connection_info_beam",
1390-
":test_rabbit_ha_test_consumer_beam",
1391-
":test_rabbit_ha_test_producer_beam",
13921317
":test_test_util_beam",
13931318
":test_test_rabbit_event_handler_beam",
13941319
":test_clustering_utils_beam",

deps/rabbit/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ define PROJECT_ENV
6767
]},
6868
{halt_on_upgrade_failure, true},
6969
{ssl_apps, [asn1, crypto, public_key, ssl]},
70-
%% see rabbitmq-server#114
71-
{mirroring_flow_control, true},
72-
{mirroring_sync_batch_size, 4096},
70+
%% classic queue storage implementation version
71+
{classic_queue_default_version, 2},
7372
%% see rabbitmq-server#227 and related tickets.
7473
%% msg_store_credit_disc_bound only takes effect when
7574
%% messages are persisted to the message store. If messages

0 commit comments

Comments
 (0)