Skip to content

Commit be19fc9

Browse files
authored
Merge pull request #13686 from rabbitmq/update-khepri_mnesia_migration-to-0.7.2
Update khepri_mnesia_migration from 0.7.1 to 0.7.2
2 parents 2af6181 + 860d9fc commit be19fc9

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

deps/rabbit/test/quorum_queue_SUITE.erl

+13-3
Original file line numberDiff line numberDiff line change
@@ -2485,11 +2485,21 @@ confirm_availability_on_leader_change(Config) ->
24852485
ok.
24862486

24872487
wait_for_new_messages(Config, Node, Name, Increase) ->
2488+
wait_for_new_messages(Config, Node, Name, Increase, 60000).
2489+
2490+
wait_for_new_messages(Config, Node, Name, Increase, Timeout) ->
24882491
Infos = rabbit_ct_broker_helpers:rabbitmqctl_list(
24892492
Config, Node, ["list_queues", "name", "messages"]),
2490-
[[Name, Msgs0]] = [Props || Props <- Infos, hd(Props) == Name],
2491-
Msgs = binary_to_integer(Msgs0),
2492-
queue_utils:wait_for_min_messages(Config, Name, Msgs + Increase).
2493+
case [Props || Props <- Infos, hd(Props) == Name] of
2494+
[[Name, Msgs0]] ->
2495+
Msgs = binary_to_integer(Msgs0),
2496+
queue_utils:wait_for_min_messages(Config, Name, Msgs + Increase);
2497+
_ when Timeout >= 0 ->
2498+
Sleep = 200,
2499+
timer:sleep(Sleep),
2500+
wait_for_new_messages(
2501+
Config, Node, Name, Increase, Timeout - Sleep)
2502+
end.
24932503

24942504
flush(T) ->
24952505
receive X ->

rabbitmq-components.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dep_cuttlefish = hex 3.4.0
4747
dep_gen_batch_server = hex 0.8.8
4848
dep_jose = hex 1.11.10
4949
dep_khepri = hex 0.16.0
50-
dep_khepri_mnesia_migration = hex 0.7.1
50+
dep_khepri_mnesia_migration = hex 0.7.2
5151
dep_meck = hex 1.0.0
5252
dep_osiris = git https://github.com/rabbitmq/osiris v1.8.6
5353
dep_prometheus = hex 4.11.0

0 commit comments

Comments
 (0)