Skip to content

Commit 3df9675

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #12610 from rabbitmq/federation-flake
Fix rabbitmq_federation queue_SUITE flake
2 parents 444df00 + 02bca63 commit 3df9675

File tree

4 files changed

+42
-35
lines changed

4 files changed

+42
-35
lines changed

‎deps/rabbitmq_federation/test/federation_status_command_SUITE.erl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,20 @@ run_federated(Config) ->
9595
timer:sleep(3000),
9696
{stream, [Props]} = ?CMD:run([], Opts#{only_down => false}),
9797
<<"upstream">> = proplists:get_value(upstream_queue, Props),
98-
<<"fed.downstream">> = proplists:get_value(queue, Props),
98+
<<"fed1.downstream">> = proplists:get_value(queue, Props),
9999
<<"fed.tag">> = proplists:get_value(consumer_tag, Props),
100100
running = proplists:get_value(status, Props)
101101
end,
102102
[rabbit_federation_test_util:q(<<"upstream">>),
103-
rabbit_federation_test_util:q(<<"fed.downstream">>)]),
103+
rabbit_federation_test_util:q(<<"fed1.downstream">>)]),
104104
%% Down
105105
rabbit_federation_test_util:with_ch(
106106
Config,
107107
fun(_) ->
108108
{stream, []} = ?CMD:run([], Opts#{only_down => true})
109109
end,
110110
[rabbit_federation_test_util:q(<<"upstream">>),
111-
rabbit_federation_test_util:q(<<"fed.downstream">>)]).
111+
rabbit_federation_test_util:q(<<"fed1.downstream">>)]).
112112

113113
run_down_federated(Config) ->
114114
[A] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
@@ -128,7 +128,7 @@ run_down_federated(Config) ->
128128
end, 15000)
129129
end,
130130
[rabbit_federation_test_util:q(<<"upstream">>),
131-
rabbit_federation_test_util:q(<<"fed.downstream">>)]),
131+
rabbit_federation_test_util:q(<<"fed1.downstream">>)]),
132132
%% Down
133133
rabbit_federation_test_util:with_ch(
134134
Config,
@@ -142,12 +142,12 @@ run_down_federated(Config) ->
142142
end, 15000)
143143
end,
144144
[rabbit_federation_test_util:q(<<"upstream">>),
145-
rabbit_federation_test_util:q(<<"fed.downstream">>)]).
145+
rabbit_federation_test_util:q(<<"fed1.downstream">>)]).
146146

147147
output_federated(Config) ->
148148
[A] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
149149
Opts = #{node => A},
150-
Input = {stream,[[{queue, <<"fed.downstream">>},
150+
Input = {stream,[[{queue, <<"fed1.downstream">>},
151151
{consumer_tag, <<"fed.tag">>},
152152
{upstream_queue, <<"upstream">>},
153153
{type, queue},
@@ -157,7 +157,7 @@ output_federated(Config) ->
157157
{local_connection, <<"<[email protected]>">>},
158158
{uri, <<"amqp://localhost:21000">>},
159159
{timestamp, {{2016,11,21},{8,51,19}}}]]},
160-
{stream, [#{queue := <<"fed.downstream">>,
160+
{stream, [#{queue := <<"fed1.downstream">>,
161161
upstream_queue := <<"upstream">>,
162162
type := queue,
163163
vhost := <<"/">>,

‎deps/rabbitmq_federation/test/queue_SUITE.erl‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ end_per_testcase(Testcase, Config) ->
160160
simple(Config) ->
161161
with_ch(Config,
162162
fun (Ch) ->
163-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>)
163+
expect_federation(Ch, <<"upstream">>, <<"fed1.downstream">>)
164164
end, upstream_downstream(Config)).
165165

166166
multiple_upstreams_pattern(Config) ->
@@ -200,9 +200,9 @@ multiple_downstreams(Config) ->
200200
with_ch(Config,
201201
fun (Ch) ->
202202
timer:sleep(?INITIAL_WAIT),
203-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
204-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream2">>, ?EXPECT_FEDERATION_TIMEOUT)
205-
end, upstream_downstream(Config) ++ [q(<<"fed.downstream2">>, Args)]).
203+
expect_federation(Ch, <<"upstream">>, <<"fed1.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
204+
expect_federation(Ch, <<"upstream2">>, <<"fed2.downstream">>, ?EXPECT_FEDERATION_TIMEOUT)
205+
end, upstream_downstream(Config) ++ [q(<<"fed2.downstream">>, Args)]).
206206

207207
message_flow(Config) ->
208208
%% TODO: specifc source / target here
@@ -236,11 +236,11 @@ dynamic_reconfiguration(Config) ->
236236
with_ch(Config,
237237
fun (Ch) ->
238238
timer:sleep(?INITIAL_WAIT),
239-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
239+
expect_federation(Ch, <<"upstream">>, <<"fed1.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
240240

241241
%% Test that clearing connections works
242242
clear_upstream(Config, 0, <<"localhost">>),
243-
expect_no_federation(Ch, <<"upstream">>, <<"fed.downstream">>),
243+
expect_no_federation(Ch, <<"upstream">>, <<"fed1.downstream">>),
244244

245245
%% Test that reading them and changing them works
246246
set_upstream(Config, 0,
@@ -249,45 +249,46 @@ dynamic_reconfiguration(Config) ->
249249
URI = rabbit_ct_broker_helpers:node_uri(Config, 0, [use_ipaddr]),
250250
set_upstream(Config, 0, <<"localhost">>, URI),
251251
set_upstream(Config, 0, <<"localhost">>, URI),
252-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>)
252+
expect_federation(Ch, <<"upstream">>, <<"fed1.downstream">>)
253253
end, upstream_downstream(Config)).
254254

255255
federate_unfederate(Config) ->
256256
Args = ?config(target_queue_args, Config),
257257
with_ch(Config,
258258
fun (Ch) ->
259259
timer:sleep(?INITIAL_WAIT),
260-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
261-
expect_federation(Ch, <<"upstream">>, <<"fed.downstream2">>, ?EXPECT_FEDERATION_TIMEOUT),
260+
expect_federation(Ch, <<"upstream">>, <<"fed1.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
261+
expect_federation(Ch, <<"upstream2">>, <<"fed2.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
262262

263263
%% clear the policy
264264
rabbit_ct_broker_helpers:clear_policy(Config, 0, <<"fed">>),
265265

266-
expect_no_federation(Ch, <<"upstream">>, <<"fed.downstream">>),
267-
expect_no_federation(Ch, <<"upstream">>, <<"fed.downstream2">>),
266+
expect_no_federation(Ch, <<"upstream">>, <<"fed1.downstream">>),
267+
expect_no_federation(Ch, <<"upstream2">>, <<"fed2.downstream">>),
268268

269269
rabbit_ct_broker_helpers:set_policy(Config, 0,
270-
<<"fed">>, <<"^fed\.">>, <<"all">>, [
270+
<<"fed">>, <<"^fed1\.">>, <<"all">>, [
271271
{<<"federation-upstream-set">>, <<"upstream">>}])
272-
end, upstream_downstream(Config) ++ [q(<<"fed.downstream2">>, Args)]).
272+
end, upstream_downstream(Config) ++ [q(<<"fed2.downstream">>, Args)]).
273273

274274
dynamic_plugin_stop_start(Config) ->
275-
DownQ2 = <<"fed.downstream2">>,
275+
DownQ2 = <<"fed2.downstream">>,
276276
Args = ?config(target_queue_args, Config),
277277
with_ch(Config,
278278
fun (Ch) ->
279279
timer:sleep(?INITIAL_WAIT),
280-
UpQ = <<"upstream">>,
281-
DownQ1 = <<"fed.downstream">>,
282-
expect_federation(Ch, UpQ, DownQ1, ?EXPECT_FEDERATION_TIMEOUT),
283-
expect_federation(Ch, UpQ, DownQ2, ?EXPECT_FEDERATION_TIMEOUT),
280+
UpQ1 = <<"upstream">>,
281+
UpQ2 = <<"upstream2">>,
282+
DownQ1 = <<"fed1.downstream">>,
283+
expect_federation(Ch, UpQ1, DownQ1, ?EXPECT_FEDERATION_TIMEOUT),
284+
expect_federation(Ch, UpQ2, DownQ2, ?EXPECT_FEDERATION_TIMEOUT),
284285

285286
%% Disable the plugin, the link disappears
286287
ct:pal("Stopping rabbitmq_federation"),
287288
ok = rabbit_ct_broker_helpers:disable_plugin(Config, 0, "rabbitmq_federation"),
288289

289-
expect_no_federation(Ch, UpQ, DownQ1),
290-
expect_no_federation(Ch, UpQ, DownQ2),
290+
expect_no_federation(Ch, UpQ1, DownQ1),
291+
expect_no_federation(Ch, UpQ2, DownQ2),
291292

292293
maybe_declare_queue(Config, Ch, q(DownQ1, Args)),
293294
maybe_declare_queue(Config, Ch, q(DownQ2, Args)),
@@ -305,12 +306,13 @@ dynamic_plugin_stop_start(Config) ->
305306
Entry || Entry <- Status,
306307
proplists:get_value(queue, Entry) =:= DownQ1 orelse
307308
proplists:get_value(queue, Entry) =:= DownQ2,
308-
proplists:get_value(upstream_queue, Entry) =:= UpQ,
309+
proplists:get_value(upstream_queue, Entry) =:= UpQ1 orelse
310+
proplists:get_value(upstream_queue, Entry) =:= UpQ2,
309311
proplists:get_value(status, Entry) =:= running
310312
],
311313
length(L) =:= 2
312314
end),
313-
expect_federation(Ch, UpQ, DownQ1, 120000)
315+
expect_federation(Ch, UpQ1, DownQ1, 120000)
314316
end, upstream_downstream(Config) ++ [q(DownQ2, Args)]).
315317

316318
restart_upstream(Config) ->
@@ -392,4 +394,4 @@ upstream_downstream() ->
392394
upstream_downstream(Config) ->
393395
SourceArgs = ?config(source_queue_args, Config),
394396
TargetArgs = ?config(target_queue_args, Config),
395-
[q(<<"upstream">>, SourceArgs), q(<<"fed.downstream">>, TargetArgs)].
397+
[q(<<"upstream">>, SourceArgs), q(<<"fed1.downstream">>, TargetArgs)].

‎deps/rabbitmq_federation/test/rabbit_federation_test_util.erl‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,17 @@ setup_federation_with_upstream_params(Config, ExtraParams) ->
9696

9797
rabbit_ct_broker_helpers:rpc(
9898
Config, 0, rabbit_policy, set,
99-
[<<"/">>, <<"fed">>, <<"^fed\.">>, [{<<"federation-upstream-set">>, <<"upstream">>}],
99+
[<<"/">>, <<"fed">>, <<"^fed1\.">>, [{<<"federation-upstream-set">>, <<"upstream">>}],
100100
0, <<"all">>, <<"acting-user">>]),
101101

102102
rabbit_ct_broker_helpers:rpc(
103103
Config, 0, rabbit_policy, set,
104-
[<<"/">>, <<"fed12">>, <<"^fed12\.">>, [{<<"federation-upstream-set">>, <<"upstream12">>}],
104+
[<<"/">>, <<"fed2">>, <<"^fed2\.">>, [{<<"federation-upstream-set">>, <<"upstream2">>}],
105+
0, <<"all">>, <<"acting-user">>]),
106+
107+
rabbit_ct_broker_helpers:rpc(
108+
Config, 0, rabbit_policy, set,
109+
[<<"/">>, <<"fed12">>, <<"^fed3\.">>, [{<<"federation-upstream-set">>, <<"upstream12">>}],
105110
2, <<"all">>, <<"acting-user">>]),
106111

107112
rabbit_ct_broker_helpers:set_policy(Config, 0,
@@ -144,10 +149,10 @@ setup_down_federation(Config) ->
144149
{<<"queue">>, <<"upstream">>}]]),
145150
rabbit_ct_broker_helpers:set_policy(
146151
Config, 0,
147-
<<"fed">>, <<"^fed\.">>, <<"all">>, [{<<"federation-upstream-set">>, <<"upstream">>}]),
152+
<<"fed">>, <<"^fed1\.">>, <<"all">>, [{<<"federation-upstream-set">>, <<"upstream">>}]),
148153
rabbit_ct_broker_helpers:set_policy(
149154
Config, 0,
150-
<<"fed">>, <<"^fed\.">>, <<"all">>, [{<<"federation-upstream-set">>, <<"upstream">>}]),
155+
<<"fed">>, <<"^fed1\.">>, <<"all">>, [{<<"federation-upstream-set">>, <<"upstream">>}]),
151156
Config.
152157

153158
wait_for_federation(Retries, Fun) ->

‎deps/rabbitmq_federation/test/restart_federation_link_command_SUITE.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ run(Config) ->
8787
ok = ?CMD:run([Id], Opts)
8888
end,
8989
[rabbit_federation_test_util:q(<<"upstream">>),
90-
rabbit_federation_test_util:q(<<"fed.downstream">>)]).
90+
rabbit_federation_test_util:q(<<"fed1.downstream">>)]).
9191

9292
run_not_found(Config) ->
9393
[A] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),

0 commit comments

Comments
 (0)