Skip to content

Commit 6c39c15

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #9417 from rabbitmq/rename-quorum-queue-utils
Rename quorum_queue_utils to queue_utils
2 parents 47e1ffd + 1ac9249 commit 6c39c15

15 files changed

+65
-65
lines changed

‎deps/rabbit/BUILD.bazel

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ rabbitmq_integration_suite(
335335
name = "quorum_queue_member_reconciliation_SUITE",
336336
size = "medium",
337337
additional_beam = [
338-
":test_quorum_queue_utils_beam",
338+
":test_queue_utils_beam",
339339
],
340340
)
341341

@@ -374,7 +374,7 @@ rabbitmq_integration_suite(
374374
name = "consumer_timeout_SUITE",
375375
size = "medium",
376376
additional_beam = [
377-
":test_quorum_queue_utils_beam",
377+
":test_queue_utils_beam",
378378
],
379379
)
380380

@@ -387,7 +387,7 @@ rabbitmq_integration_suite(
387387
name = "dead_lettering_SUITE",
388388
size = "large",
389389
additional_beam = [
390-
":test_quorum_queue_utils_beam",
390+
":test_queue_utils_beam",
391391
],
392392
shard_count = 7,
393393
)
@@ -430,7 +430,7 @@ rabbitmq_integration_suite(
430430
name = "dynamic_qq_SUITE",
431431
size = "large",
432432
additional_beam = [
433-
":test_quorum_queue_utils_beam",
433+
":test_queue_utils_beam",
434434
],
435435
flaky = True,
436436
deps = [
@@ -513,7 +513,7 @@ rabbitmq_integration_suite(
513513
name = "maintenance_mode_SUITE",
514514
size = "medium",
515515
additional_beam = [
516-
":test_quorum_queue_utils_beam",
516+
":test_queue_utils_beam",
517517
],
518518
)
519519

@@ -650,7 +650,7 @@ rabbitmq_integration_suite(
650650
name = "publisher_confirms_parallel_SUITE",
651651
size = "medium",
652652
additional_beam = [
653-
":test_quorum_queue_utils_beam",
653+
":test_queue_utils_beam",
654654
],
655655
)
656656

@@ -669,7 +669,7 @@ rabbitmq_integration_suite(
669669
name = "queue_parallel_SUITE",
670670
size = "large",
671671
additional_beam = [
672-
":test_quorum_queue_utils_beam",
672+
":test_queue_utils_beam",
673673
],
674674
shard_count = 6,
675675
)
@@ -683,7 +683,7 @@ rabbitmq_integration_suite(
683683
name = "quorum_queue_SUITE",
684684
size = "large",
685685
additional_beam = [
686-
":test_quorum_queue_utils_beam",
686+
":test_queue_utils_beam",
687687
],
688688
flaky = True,
689689
shard_count = 6,
@@ -744,7 +744,7 @@ rabbitmq_integration_suite(
744744
size = "medium",
745745
additional_beam = [
746746
":test_test_util_beam",
747-
":test_quorum_queue_utils_beam",
747+
":test_queue_utils_beam",
748748
":quorum_queue_SUITE_beam_files",
749749
],
750750
deps = [
@@ -819,7 +819,7 @@ rabbitmq_integration_suite(
819819
name = "rabbit_stream_queue_SUITE",
820820
size = "large",
821821
additional_beam = [
822-
":test_quorum_queue_utils_beam",
822+
":test_queue_utils_beam",
823823
],
824824
shard_count = 21,
825825
deps = [
@@ -867,7 +867,7 @@ rabbitmq_integration_suite(
867867
name = "single_active_consumer_SUITE",
868868
size = "medium",
869869
additional_beam = [
870-
":test_quorum_queue_utils_beam",
870+
":test_queue_utils_beam",
871871
],
872872
)
873873

@@ -1091,7 +1091,7 @@ rabbitmq_integration_suite(
10911091
name = "direct_exchange_routing_v2_SUITE",
10921092
size = "medium",
10931093
additional_beam = [
1094-
":test_quorum_queue_utils_beam",
1094+
":test_queue_utils_beam",
10951095
],
10961096
)
10971097

@@ -1112,7 +1112,7 @@ rabbitmq_integration_suite(
11121112
name = "exchanges_SUITE",
11131113
size = "medium",
11141114
additional_beam = [
1115-
":test_quorum_queue_utils_beam",
1115+
":test_queue_utils_beam",
11161116
],
11171117
)
11181118

@@ -1256,7 +1256,7 @@ eunit(
12561256
":test_dummy_supervisor2_beam",
12571257
":test_failing_dummy_interceptor_beam",
12581258
":test_mirrored_supervisor_SUITE_gs_beam",
1259-
":test_quorum_queue_utils_beam",
1259+
":test_queue_utils_beam",
12601260
":test_rabbit_auth_backend_context_propagation_mock_beam",
12611261
":test_rabbit_dummy_protocol_connection_info_beam",
12621262
":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
@@ -1536,10 +1536,10 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
15361536
erlc_opts = "//:test_erlc_opts",
15371537
)
15381538
erlang_bytecode(
1539-
name = "test_quorum_queue_utils_beam",
1539+
name = "test_queue_utils_beam",
15401540
testonly = True,
1541-
srcs = ["test/quorum_queue_utils.erl"],
1542-
outs = ["test/quorum_queue_utils.beam"],
1541+
srcs = ["test/queue_utils.erl"],
1542+
outs = ["test/queue_utils.beam"],
15431543
app_name = "rabbit",
15441544
erlc_opts = "//:test_erlc_opts",
15451545
)

‎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/quorum_queue_member_reconciliation_SUITE.erl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ auto_grow(Config) ->
114114
declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
115115

116116
%% There is only one node in the cluster at the moment
117-
{ok, Members, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
117+
{ok, Members, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
118118
?assertEqual(1, length(Members)),
119119

120120
add_server_to_cluster(Server1, Server0),
121121
%% With 2 nodes in the cluster, target group size is not reached, so no
122122
%% new members should be available. We sleep a while so the periodic check
123123
%% runs
124124
timer:sleep(4000),
125-
{ok, Members, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
125+
{ok, Members, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
126126
?assertEqual(1, length(Members)),
127127

128128
add_server_to_cluster(Server2, Server0),
129129
%% With 3 nodes in the cluster, target size is met so eventually it should
130130
%% be 3 members
131131
wait_until(fun() ->
132-
{ok, M, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
132+
{ok, M, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
133133
3 =:= length(M)
134134
end).
135135

@@ -143,7 +143,7 @@ auto_grow_drained_node(Config) ->
143143
declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
144144

145145
%% There is only one node in the cluster at the moment
146-
{ok, Members, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
146+
{ok, Members, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
147147
?assertEqual(1, length(Members)),
148148

149149
add_server_to_cluster(Server1, Server0),
@@ -156,7 +156,7 @@ auto_grow_drained_node(Config) ->
156156
add_server_to_cluster(Server2, Server0),
157157
timer:sleep(5000),
158158
%% We have 3 nodes, but one is drained, so it will not be concidered.
159-
{ok, Members1, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
159+
{ok, Members1, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
160160
?assertEqual(1, length(Members1)),
161161

162162
rabbit_ct_broker_helpers:unmark_as_being_drained(Config, Server1),
@@ -165,7 +165,7 @@ auto_grow_drained_node(Config) ->
165165
10000),
166166
%% We have 3 nodes, none is being drained, so we should grow membership to 3
167167
wait_until(fun() ->
168-
{ok, M, _} = ra:members({quorum_queue_utils:ra_name(QQ), Server0}),
168+
{ok, M, _} = ra:members({queue_utils:ra_name(QQ), Server0}),
169169
3 =:= length(M)
170170
end).
171171

@@ -182,7 +182,7 @@ auto_shrink(Config) ->
182182
declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
183183

184184
wait_until(fun() ->
185-
{ok, M, _} = ra:members({quorum_queue_utils:ra_name(QQ),
185+
{ok, M, _} = ra:members({queue_utils:ra_name(QQ),
186186
Server0}),
187187
3 =:= length(M)
188188
end),
@@ -191,7 +191,7 @@ auto_shrink(Config) ->
191191
[Server2, false]),
192192
%% with one node 'forgotten', eventually the membership will shrink to 2
193193
wait_until(fun() ->
194-
{ok, M, _} = ra:members({quorum_queue_utils:ra_name(QQ),
194+
{ok, M, _} = ra:members({queue_utils:ra_name(QQ),
195195
Server0}),
196196
2 =:= length(M)
197197
end).

‎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]).

0 commit comments

Comments
 (0)