Skip to content

Commit efa73ea

Browse files
Merge branch 'v3.12.x' into mergify/bp/v3.12.x/pr-9550
2 parents a304c18 + 5a07beb commit efa73ea

14 files changed

+56
-56
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ rabbitmq_integration_suite(
363363
name = "consumer_timeout_SUITE",
364364
size = "medium",
365365
additional_beam = [
366-
":test_quorum_queue_utils_beam",
366+
":test_queue_utils_beam",
367367
],
368368
)
369369

@@ -376,7 +376,7 @@ rabbitmq_integration_suite(
376376
name = "dead_lettering_SUITE",
377377
size = "large",
378378
additional_beam = [
379-
":test_quorum_queue_utils_beam",
379+
":test_queue_utils_beam",
380380
],
381381
shard_count = 7,
382382
)
@@ -411,7 +411,7 @@ rabbitmq_integration_suite(
411411
name = "dynamic_qq_SUITE",
412412
size = "large",
413413
additional_beam = [
414-
":test_quorum_queue_utils_beam",
414+
":test_queue_utils_beam",
415415
],
416416
deps = [
417417
"@proper//:erlang_app",
@@ -493,7 +493,7 @@ rabbitmq_integration_suite(
493493
name = "maintenance_mode_SUITE",
494494
size = "medium",
495495
additional_beam = [
496-
":test_quorum_queue_utils_beam",
496+
":test_queue_utils_beam",
497497
],
498498
)
499499

@@ -624,7 +624,7 @@ rabbitmq_integration_suite(
624624
name = "publisher_confirms_parallel_SUITE",
625625
size = "medium",
626626
additional_beam = [
627-
":test_quorum_queue_utils_beam",
627+
":test_queue_utils_beam",
628628
],
629629
)
630630

@@ -643,7 +643,7 @@ rabbitmq_integration_suite(
643643
name = "queue_parallel_SUITE",
644644
size = "large",
645645
additional_beam = [
646-
":test_quorum_queue_utils_beam",
646+
":test_queue_utils_beam",
647647
],
648648
shard_count = 6,
649649
)
@@ -657,8 +657,8 @@ rabbitmq_integration_suite(
657657
name = "quorum_queue_SUITE",
658658
size = "large",
659659
additional_beam = [
660-
":test_quorum_queue_utils_beam",
661660
":test_clustering_utils_beam",
661+
":test_queue_utils_beam",
662662
],
663663
shard_count = 6,
664664
)
@@ -718,7 +718,7 @@ rabbitmq_integration_suite(
718718
size = "medium",
719719
additional_beam = [
720720
":test_test_util_beam",
721-
":test_quorum_queue_utils_beam",
721+
":test_queue_utils_beam",
722722
":quorum_queue_SUITE_beam_files",
723723
],
724724
deps = [
@@ -784,7 +784,7 @@ rabbitmq_integration_suite(
784784
name = "rabbit_stream_queue_SUITE",
785785
size = "large",
786786
additional_beam = [
787-
":test_quorum_queue_utils_beam",
787+
":test_queue_utils_beam",
788788
],
789789
shard_count = 12,
790790
deps = [
@@ -826,7 +826,7 @@ rabbitmq_integration_suite(
826826
name = "single_active_consumer_SUITE",
827827
size = "medium",
828828
additional_beam = [
829-
":test_quorum_queue_utils_beam",
829+
":test_queue_utils_beam",
830830
],
831831
)
832832

@@ -1050,7 +1050,7 @@ rabbitmq_integration_suite(
10501050
name = "direct_exchange_routing_v2_SUITE",
10511051
size = "medium",
10521052
additional_beam = [
1053-
":test_quorum_queue_utils_beam",
1053+
":test_queue_utils_beam",
10541054
],
10551055
)
10561056

@@ -1071,7 +1071,7 @@ rabbitmq_integration_suite(
10711071
name = "exchanges_SUITE",
10721072
size = "medium",
10731073
additional_beam = [
1074-
":test_quorum_queue_utils_beam",
1074+
":test_queue_utils_beam",
10751075
],
10761076
)
10771077

@@ -1218,7 +1218,7 @@ eunit(
12181218
":test_dummy_supervisor2_beam",
12191219
":test_failing_dummy_interceptor_beam",
12201220
":test_mirrored_supervisor_SUITE_gs_beam",
1221-
":test_quorum_queue_utils_beam",
1221+
":test_queue_utils_beam",
12221222
":test_rabbit_auth_backend_context_propagation_mock_beam",
12231223
":test_rabbit_dummy_protocol_connection_info_beam",
12241224
":test_rabbit_foo_protocol_connection_info_beam",

deps/rabbit/app.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,10 +1493,10 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
14931493
erlc_opts = "//:test_erlc_opts",
14941494
)
14951495
erlang_bytecode(
1496-
name = "test_quorum_queue_utils_beam",
1496+
name = "test_queue_utils_beam",
14971497
testonly = True,
1498-
srcs = ["test/quorum_queue_utils.erl"],
1499-
outs = ["test/quorum_queue_utils.beam"],
1498+
srcs = ["test/queue_utils.erl"],
1499+
outs = ["test/queue_utils.beam"],
15001500
app_name = "rabbit",
15011501
erlc_opts = "//:test_erlc_opts",
15021502
)

deps/rabbit/test/consumer_timeout_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{queue_policy, []},
2828
{queue_arguments, [{<<"x-consumer-timeout">>, long, ?CONSUMER_TIMEOUT}]}]}).
2929

30-
-import(quorum_queue_utils, [wait_for_messages/2]).
30+
-import(queue_utils, [wait_for_messages/2]).
3131

3232
all() ->
3333
[

deps/rabbit/test/dead_lettering_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
-compile([export_all, nowarn_export_all]).
1717

18-
-import(quorum_queue_utils, [wait_for_messages/2]).
18+
-import(queue_utils, [wait_for_messages/2]).
1919

2020
all() ->
2121
[

deps/rabbit/test/direct_exchange_routing_v2_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ route_exchange_to_exchange(Config) ->
304304
bind_queue(Ch, Q2, FanoutX, <<"ignored">>),
305305

306306
publish(Ch, DirectX, RKey),
307-
quorum_queue_utils:wait_for_messages(Config, [[Q1, <<"1">>, <<"1">>, <<"0">>]]),
308-
quorum_queue_utils:wait_for_messages(Config, [[Q2, <<"1">>, <<"1">>, <<"0">>]]),
307+
queue_utils:wait_for_messages(Config, [[Q1, <<"1">>, <<"1">>, <<"0">>]]),
308+
queue_utils:wait_for_messages(Config, [[Q2, <<"1">>, <<"1">>, <<"0">>]]),
309309
?assertEqual(1, table_size(Config, ?INDEX_TABLE_NAME)),
310310

311311
%% cleanup

deps/rabbit/test/dynamic_qq_SUITE.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
-include_lib("amqp_client/include/amqp_client.hrl").
1212
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
1313

14-
-import(quorum_queue_utils, [wait_for_messages_ready/3,
15-
ra_name/1]).
14+
-import(queue_utils, [wait_for_messages_ready/3,
15+
ra_name/1]).
1616

1717
-compile(nowarn_export_all).
1818
-compile(export_all).

deps/rabbit/test/exchanges_SUITE.erl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ direct_exchange(Config) ->
104104
publish(Ch, Direct, Q, <<"msg1">>),
105105
publish(Ch, Direct, <<"anyotherkey">>, <<"msg2">>),
106106

107-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>],
107+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>],
108108
[AltQ, <<"0">>, <<"0">>, <<"0">>]]),
109109
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg1">>}},
110110
amqp_channel:call(Ch, #'basic.get'{queue = Q})),
@@ -139,7 +139,7 @@ topic_exchange(Config) ->
139139
publish(Ch, Topic, <<"simplycarrots">>, <<"msg5">>),
140140
publish(Ch, Topic, <<"*.queue.rules">>, <<"msg6">>),
141141

142-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"3">>, <<"0">>]]),
142+
queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"3">>, <<"0">>]]),
143143
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg1">>}},
144144
amqp_channel:call(Ch, #'basic.get'{queue = Q})),
145145
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg2">>}},
@@ -153,11 +153,11 @@ topic_exchange(Config) ->
153153
queue = Q,
154154
routing_key = <<"#.noclue">>}),
155155
publish(Ch, Topic, <<"simplycarrots">>, <<"msg7">>),
156-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"0">>, <<"3">>]]),
156+
queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"0">>, <<"3">>]]),
157157
publish(Ch, Topic, <<"#.bla">>, <<"msg8">>),
158-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"0">>, <<"3">>]]),
158+
queue_utils:wait_for_messages(Config, [[Q, <<"3">>, <<"0">>, <<"3">>]]),
159159
publish(Ch, Topic, <<"#.noclue">>, <<"msg9">>),
160-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"4">>, <<"1">>, <<"3">>]]),
160+
queue_utils:wait_for_messages(Config, [[Q, <<"4">>, <<"1">>, <<"3">>]]),
161161
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg9">>}},
162162
amqp_channel:call(Ch, #'basic.get'{queue = Q})),
163163
?assertMatch(#'basic.get_empty'{},
@@ -167,7 +167,7 @@ topic_exchange(Config) ->
167167
queue = Q,
168168
routing_key = <<"#">>}),
169169
publish(Ch, Topic, <<"simplycarrots">>, <<"msg10">>),
170-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"5">>, <<"1">>, <<"4">>]]),
170+
queue_utils:wait_for_messages(Config, [[Q, <<"5">>, <<"1">>, <<"4">>]]),
171171
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg10">>}},
172172
amqp_channel:call(Ch, #'basic.get'{queue = Q})),
173173
?assertMatch(#'basic.get_empty'{},
@@ -193,7 +193,7 @@ fanout_exchange(Config) ->
193193
publish(Ch, Fanout, Q, <<"msg1">>),
194194
publish(Ch, Fanout, <<"anyotherkey">>, <<"msg2">>),
195195

196-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>],
196+
queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>],
197197
[AltQ, <<"2">>, <<"2">>, <<"0">>]]),
198198
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg1">>}},
199199
amqp_channel:call(Ch, #'basic.get'{queue = Q})),
@@ -241,7 +241,7 @@ headers_exchange(Config) ->
241241
publish(Ch, Headers, <<>>, <<"msg2">>, [{<<"foo">>, longstr, <<"bar">>}]),
242242
publish(Ch, Headers, <<>>, <<"msg3">>),
243243

244-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>],
244+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>],
245245
[AltQ, <<"2">>, <<"2">>, <<"0">>]]),
246246

247247
?assertMatch({#'basic.get_ok'{}, #amqp_msg{payload = <<"msg1">>}},

deps/rabbit/test/maintenance_mode_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ quorum_queue_leadership_transfer(Config) ->
242242
fun () -> rabbit_ct_broker_helpers:is_being_drained_local_read(Config, A) end, 10000),
243243

244244
%% quorum queue leader election is asynchronous
245-
AllTheSame = quorum_queue_utils:fifo_machines_use_same_version(
245+
AllTheSame = queue_utils:fifo_machines_use_same_version(
246246
Config, Nodenames),
247247
case AllTheSame of
248248
true ->

deps/rabbit/test/publisher_confirms_parallel_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
-define(TIMEOUT, 60000).
1717

18-
-import(quorum_queue_utils, [wait_for_messages/2]).
18+
-import(queue_utils, [wait_for_messages/2]).
1919

2020
all() ->
2121
[

deps/rabbit/test/quorum_queue_utils.erl renamed to deps/rabbit/test/queue_utils.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-module(quorum_queue_utils).
1+
-module(queue_utils).
22

33
-include_lib("eunit/include/eunit.hrl").
44

deps/rabbit/test/quorum_queue_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-include_lib("amqp_client/include/amqp_client.hrl").
1212
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
1313

14-
-import(quorum_queue_utils, [wait_for_messages_ready/3,
14+
-import(queue_utils, [wait_for_messages_ready/3,
1515
wait_for_messages_pending_ack/3,
1616
wait_for_messages_total/3,
1717
wait_for_messages/2,

deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
-include_lib("amqp_client/include/amqp_client.hrl").
1919
-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
2020

21-
-import(quorum_queue_utils, [wait_for_messages_ready/3,
22-
wait_for_min_messages/3,
23-
dirty_query/3,
24-
ra_name/1]).
21+
-import(queue_utils, [wait_for_messages_ready/3,
22+
wait_for_min_messages/3,
23+
dirty_query/3,
24+
ra_name/1]).
2525
-import(rabbit_ct_helpers, [eventually/1,
2626
eventually/3,
2727
consistently/1]).

deps/rabbit/test/rabbit_stream_queue_SUITE.erl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ publish(Config) ->
736736
declare(Ch, Q, [{<<"x-queue-type">>, longstr, <<"stream">>}])),
737737

738738
publish(Ch, Q),
739-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
739+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
740740
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
741741

742742
publish_confirm(Config) ->
@@ -751,7 +751,7 @@ publish_confirm(Config) ->
751751
amqp_channel:register_confirm_handler(Ch, self()),
752752
publish(Ch, Q),
753753
amqp_channel:wait_for_confirms(Ch, 5),
754-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
754+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
755755
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
756756

757757
restart_single_node(Config) ->
@@ -762,15 +762,15 @@ restart_single_node(Config) ->
762762
?assertEqual({'queue.declare_ok', Q, 0, 0},
763763
declare(Ch, Q, [{<<"x-queue-type">>, longstr, <<"stream">>}])),
764764
publish(Ch, Q),
765-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
765+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
766766

767767
rabbit_control_helper:command(stop_app, Server),
768768
rabbit_control_helper:command(start_app, Server),
769769

770-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
770+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
771771
Ch1 = rabbit_ct_client_helpers:open_channel(Config, Server),
772772
publish(Ch1, Q),
773-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>]]),
773+
queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>]]),
774774
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
775775

776776
%% the failing case for this test relies on a particular random condition
@@ -816,7 +816,7 @@ recover(Config) ->
816816
?assertEqual({'queue.declare_ok', Q, 0, 0},
817817
declare(Ch, Q, [{<<"x-queue-type">>, longstr, <<"stream">>}])),
818818
publish(Ch, Q),
819-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
819+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]]),
820820

821821
Perm0 = permute(Servers0),
822822
Servers = lists:nth(rand:uniform(length(Perm0)), Perm0),
@@ -828,7 +828,7 @@ recover(Config) ->
828828
[rabbit_ct_broker_helpers:start_node(Config, S) || S <- lists:reverse(Servers)],
829829
ct:pal("recover: running stop waiting for messages ~w", [Servers]),
830830
check_leader_and_replicas(Config, Servers0),
831-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]], 60),
831+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]], 60),
832832

833833
%% Another single random permutation
834834
Perm1 = permute(Servers0),
@@ -839,11 +839,11 @@ recover(Config) ->
839839
[rabbit_control_helper:command(start_app, S) || S <- lists:reverse(Servers1)],
840840
ct:pal("recover: running app stop waiting for messages ~w", [Servers1]),
841841
check_leader_and_replicas(Config, Servers0),
842-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]], 60),
842+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]], 60),
843843

844844
Ch1 = rabbit_ct_client_helpers:open_channel(Config, Server),
845845
publish(Ch1, Q),
846-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>]]),
846+
queue_utils:wait_for_messages(Config, [[Q, <<"2">>, <<"2">>, <<"0">>]]),
847847
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
848848

849849
restart_coordinator_without_queues(Config) ->
@@ -1356,7 +1356,7 @@ consume_and_ack(Config) ->
13561356
%%
13571357
?assertMatch({'queue.declare_ok', Q, _MsgCount, 0},
13581358
declare(Ch1, Q, [{<<"x-queue-type">>, longstr, <<"stream">>}])),
1359-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]])
1359+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]])
13601360
after 5000 ->
13611361
exit(timeout)
13621362
end,
@@ -1795,8 +1795,8 @@ max_age(Config) ->
17951795
amqp_channel:wait_for_confirms(Ch, 5),
17961796

17971797
%% Let's give it some margin if some messages fall between segments
1798-
quorum_queue_utils:wait_for_min_messages(Config, Q, 100),
1799-
quorum_queue_utils:wait_for_max_messages(Config, Q, 150),
1798+
queue_utils:wait_for_min_messages(Config, Q, 100),
1799+
queue_utils:wait_for_max_messages(Config, Q, 150),
18001800

18011801
rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
18021802

@@ -2269,7 +2269,7 @@ update_retention_policy(Config) ->
22692269

22702270
%% Retention policy should clear approximately 2/3 of the messages, but just to be safe
22712271
%% let's simply check that it removed half of them
2272-
quorum_queue_utils:wait_for_max_messages(Config, Q, 5000),
2272+
queue_utils:wait_for_max_messages(Config, Q, 5000),
22732273

22742274
{ok, Q1} = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_amqqueue, lookup,
22752275
[rabbit_misc:r(<<"/">>, queue, Q)]),
@@ -2389,7 +2389,7 @@ dead_letter_target(Config) ->
23892389
ok = amqp_channel:cast(Ch1, #'basic.nack'{delivery_tag = DeliveryTag,
23902390
requeue =false,
23912391
multiple = false}),
2392-
quorum_queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]])
2392+
queue_utils:wait_for_messages(Config, [[Q, <<"1">>, <<"1">>, <<"0">>]])
23932393
after 5000 ->
23942394
exit(timeout)
23952395
end,

0 commit comments

Comments
 (0)