Skip to content

Commit 1d9f179

Browse files
committed
Fix flake(s) in rabbit_fifo_int_SUITE
The start_cluster helper used the same UID (!!) for all members in the local cluster. This resulted in shared mem tables and all sorts of havoc.
1 parent 44657cd commit 1d9f179

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

deps/rabbit/test/rabbit_fifo_int_SUITE.erl

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -942,14 +942,17 @@ discard_next_delivery(ClusterName, State0, Wait) ->
942942
end.
943943

944944
start_cluster(ClusterName, ServerIds, RaFifoConfig) ->
945-
UId = ra:new_uid(ra_lib:to_binary(ClusterName#resource.name)),
946-
Confs = [#{id => Id,
947-
uid => UId,
948-
cluster_name => ClusterName#resource.name,
949-
log_init_args => #{uid => UId},
950-
initial_members => ServerIds,
951-
initial_machine_version => rabbit_fifo:version(),
952-
machine => {module, rabbit_fifo, RaFifoConfig}}
945+
NameBin = ra_lib:to_binary(ClusterName#resource.name),
946+
Confs = [begin
947+
UId = ra:new_uid(NameBin),
948+
#{id => Id,
949+
uid => UId,
950+
cluster_name => ClusterName#resource.name,
951+
log_init_args => #{uid => UId},
952+
initial_members => ServerIds,
953+
initial_machine_version => rabbit_fifo:version(),
954+
machine => {module, rabbit_fifo, RaFifoConfig}}
955+
end
953956
|| Id <- ServerIds],
954957
{ok, Started, _} = ra:start_cluster(?RA_SYSTEM, Confs),
955958
?assertEqual(length(Started), length(ServerIds)),

0 commit comments

Comments
 (0)