@@ -87,9 +87,8 @@ _APP_ENV = """[
87
87
]},
88
88
{halt_on_upgrade_failure, true},
89
89
{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},
93
92
%% see rabbitmq-server#227 and related tickets.
94
93
%% msg_store_credit_disc_bound only takes effect when
95
94
%% messages are persisted to the message store. If messages
@@ -397,7 +396,7 @@ rabbitmq_integration_suite(
397
396
additional_beam = [
398
397
":test_queue_utils_beam" ,
399
398
],
400
- shard_count = 8 ,
399
+ shard_count = 6 ,
401
400
)
402
401
403
402
rabbitmq_integration_suite (
@@ -429,17 +428,6 @@ rabbitmq_integration_suite(
429
428
size = "medium" ,
430
429
)
431
430
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
-
443
431
rabbitmq_integration_suite (
444
432
name = "dynamic_qq_SUITE" ,
445
433
size = "large" ,
@@ -451,18 +439,6 @@ rabbitmq_integration_suite(
451
439
],
452
440
)
453
441
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
-
466
442
rabbitmq_integration_suite (
467
443
name = "feature_flags_SUITE" ,
468
444
size = "large" ,
@@ -530,15 +506,6 @@ rabbitmq_integration_suite(
530
506
],
531
507
)
532
508
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
-
542
509
rabbitmq_integration_suite (
543
510
name = "rabbit_message_interceptor_SUITE" ,
544
511
size = "medium" ,
@@ -677,7 +644,7 @@ rabbitmq_integration_suite(
677
644
rabbitmq_integration_suite (
678
645
name = "queue_master_location_SUITE" ,
679
646
size = "large" ,
680
- shard_count = 3 ,
647
+ shard_count = 2 ,
681
648
)
682
649
683
650
rabbitmq_integration_suite (
@@ -686,7 +653,7 @@ rabbitmq_integration_suite(
686
653
additional_beam = [
687
654
":test_queue_utils_beam" ,
688
655
],
689
- shard_count = 6 ,
656
+ shard_count = 5 ,
690
657
)
691
658
692
659
rabbitmq_integration_suite (
@@ -871,16 +838,6 @@ rabbitmq_integration_suite(
871
838
size = "medium" ,
872
839
)
873
840
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
-
884
841
rabbitmq_integration_suite (
885
842
name = "single_active_consumer_SUITE" ,
886
843
size = "medium" ,
@@ -889,11 +846,6 @@ rabbitmq_integration_suite(
889
846
],
890
847
)
891
848
892
- rabbitmq_integration_suite (
893
- name = "sync_detection_SUITE" ,
894
- size = "medium" ,
895
- )
896
-
897
849
rabbitmq_integration_suite (
898
850
name = "term_to_binary_compat_prop_SUITE" ,
899
851
deps = [
@@ -1018,15 +970,6 @@ rabbitmq_integration_suite(
1018
970
size = "medium" ,
1019
971
)
1020
972
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
-
1030
973
rabbitmq_integration_suite (
1031
974
name = "unit_log_management_SUITE" ,
1032
975
size = "medium" ,
@@ -1107,22 +1050,6 @@ rabbitmq_integration_suite(
1107
1050
],
1108
1051
)
1109
1052
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
-
1126
1053
rabbitmq_integration_suite (
1127
1054
name = "direct_exchange_routing_v2_SUITE" ,
1128
1055
size = "medium" ,
@@ -1387,8 +1314,6 @@ eunit(
1387
1314
":test_rabbit_auth_backend_context_propagation_mock_beam" ,
1388
1315
":test_rabbit_dummy_protocol_connection_info_beam" ,
1389
1316
":test_rabbit_foo_protocol_connection_info_beam" ,
1390
- ":test_rabbit_ha_test_consumer_beam" ,
1391
- ":test_rabbit_ha_test_producer_beam" ,
1392
1317
":test_test_util_beam" ,
1393
1318
":test_test_rabbit_event_handler_beam" ,
1394
1319
":test_clustering_utils_beam" ,
0 commit comments