Skip to content

Commit 0a24602

Browse files
committed
amqp10_inter_cluster_SUITE: Log messages and queues length
[Why] This should also help debug the failures we get in CI. (cherry picked from commit fda663d)
1 parent 2b5148f commit 0a24602

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

deps/rabbitmq_shovel/test/amqp10_inter_cluster_SUITE.erl

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ shovel(Caller, SrcNode, DestNode, ShovelNode, Config) ->
128128

129129
ok = amqp10_client:flow_link_credit(Receiver, NumMsgs, never),
130130
Msgs = receive_messages(Receiver, NumMsgs),
131+
ct:pal("~b messages:~n~p", [length(Msgs), Msgs]),
131132
lists:map(
132133
fun(N) ->
133134
Msg = lists:nth(N, Msgs),
@@ -140,15 +141,27 @@ shovel(Caller, SrcNode, DestNode, ShovelNode, Config) ->
140141
[<<"/">>, <<"shovel">>, ShovelName, none]),
141142
ExpectedQueueLen = 0,
142143
?awaitMatch(
143-
[ExpectedQueueLen],
144-
rpc(Config, ?OLD, ?MODULE, queues_length, []),
144+
[{_, ExpectedQueueLen}],
145+
begin
146+
Ret = rpc(Config, ?OLD, ?MODULE, queues_length, []),
147+
ct:pal("Queues on old: ~p", [Ret]),
148+
Ret
149+
end,
145150
30000),
146151
?awaitMatch(
147-
[ExpectedQueueLen],
148-
rpc(Config, ?NEW, ?MODULE, queues_length, []),
152+
[{_, ExpectedQueueLen}],
153+
begin
154+
Ret = rpc(Config, ?NEW, ?MODULE, queues_length, []),
155+
ct:pal("Queues on new: ~p", [Ret]),
156+
Ret
157+
end,
149158
30000),
150-
?assertEqual([ExpectedQueueLen], rpc(Config, ?OLD, ?MODULE, delete_queues, [])),
151-
?assertEqual([ExpectedQueueLen], rpc(Config, ?NEW, ?MODULE, delete_queues, [])).
159+
?assertEqual(
160+
[ExpectedQueueLen],
161+
rpc(Config, ?OLD, ?MODULE, delete_queues, [])),
162+
?assertEqual(
163+
[ExpectedQueueLen],
164+
rpc(Config, ?NEW, ?MODULE, delete_queues, [])).
152165

153166
wait_for_credit(Sender) ->
154167
receive
@@ -183,8 +196,9 @@ flush(Prefix) ->
183196

184197
queues_length() ->
185198
[begin
199+
#{<<"name">> := Name} = amqqueue:to_printable(Q),
186200
[{messages, N}] = rabbit_amqqueue:info(Q, [messages]),
187-
N
201+
{Name, N}
188202
end || Q <- rabbit_amqqueue:list()].
189203

190204
delete_queues() ->

0 commit comments

Comments
 (0)