Sort for better determinism

Author: acogoluegnes

deps/rabbit/src/rabbit_stream_sac_coordinator.erl

@@ -327,9 +327,9 @@ apply(#command_activate_consumer{vhost = VirtualHost,
 apply(#command_connection_reconnected{pid = Pid},
       #?MODULE{groups = Groups0} = State0) ->
     {State1, Eff} =
-        maps:fold(fun(G, _, {St, Eff}) ->
-                          handle_group_connection_reconnected(Pid, St, Eff, G)
-                  end, {State0, []}, Groups0),
+    maps:fold(fun(G, _, {St, Eff}) ->
+                      handle_group_connection_reconnected(Pid, St, Eff, G)
+              end, {State0, []}, Groups0),
 
     {State1, ok, Eff};
 apply(#command_purge_nodes{nodes = Nodes}, State0) ->
@@ -554,26 +554,26 @@ consumer_groups(VirtualHost, InfoKeys, #?MODULE{groups = Groups} = S)
                          #group{consumers = Consumers,
                                 partition_index = PartitionIndex},
                          Acc)
-                            when VH == VirtualHost ->
+                          when VH == VirtualHost ->
                             Record =
-                                lists:foldr(fun (stream, RecAcc) ->
-                                                    [{stream, Stream} | RecAcc];
-                                                (reference, RecAcc) ->
-                                                    [{reference, Reference}
-                                                     | RecAcc];
-                                                (partition_index, RecAcc) ->
-                                                    [{partition_index,
-                                                      PartitionIndex}
-                                                     | RecAcc];
-                                                (consumers, RecAcc) ->
-                                                    [{consumers,
-                                                      length(Consumers)}
-                                                     | RecAcc];
-                                                (Unknown, RecAcc) ->
-                                                    [{Unknown, unknown_field}
-                                                     | RecAcc]
-                                            end,
-                                            [], InfoKeys),
+                            lists:foldr(fun (stream, RecAcc) ->
+                                                [{stream, Stream} | RecAcc];
+                                            (reference, RecAcc) ->
+                                                [{reference, Reference}
+                                                 | RecAcc];
+                                            (partition_index, RecAcc) ->
+                                                [{partition_index,
+                                                  PartitionIndex}
+                                                 | RecAcc];
+                                            (consumers, RecAcc) ->
+                                                [{consumers,
+                                                  length(Consumers)}
+                                                 | RecAcc];
+                                            (Unknown, RecAcc) ->
+                                                [{Unknown, unknown_field}
+                                                 | RecAcc]
+                                        end,
+                                        [], InfoKeys),
                             [Record | Acc];
                         (_GroupId, _Group, Acc) ->
                             Acc
@@ -745,10 +745,10 @@ handle_connection_node_disconnected(ConnPid,
         {Groups, PidsGroups1} ->
             State1 = State0#?MODULE{pids_groups = PidsGroups1},
             State2 =
-                maps:fold(fun(G, _, Acc) ->
-                                  handle_group_after_connection_node_disconnected(
-                                    ConnPid, Acc, G)
-                          end, State1, Groups),
+            maps:fold(fun(G, _, Acc) ->
+                              handle_group_after_connection_node_disconnected(
+                                ConnPid, Acc, G)
+                      end, State1, Groups),
             T = disconnected_timeout(State2),
             {State2, [node_disconnected_timer_effect(ConnPid, T)]}
     end.
@@ -897,7 +897,7 @@ list_nodes(#?MODULE{groups = Groups}) ->
                               GNodes = nodes_from_group(G),
                               maps:merge(Acc, GNodes)
                       end, #{}, Groups),
-    maps:keys(Nodes).
+    lists:sort(maps:keys(Nodes)).
 
 -spec state_enter(ra_server:ra_state(), state() | term()) ->
     ra_machine:effects().
@@ -923,7 +923,7 @@ state_enter(leader, #?MODULE{groups = Groups} = State)
     DisTimeout = disconnected_timeout(State),
     %% monitor involved nodes
     %% reset a timer for disconnected connections
-    [{monitor, node, N} || N <- maps:keys(Nodes)] ++
+    [{monitor, node, N} || N <- lists:sort(maps:keys(Nodes))] ++
     [begin
          Time = case ts() - Ts of
              T when T < 10_000 ->
@@ -933,7 +933,7 @@ state_enter(leader, #?MODULE{groups = Groups} = State)
                  DisTimeout
          end,
          node_disconnected_timer_effect(P, Time)
-     end || P := Ts <- DisConns];
+     end || P := Ts <- maps:iterator(DisConns, ordered)];
 state_enter(_, _) ->
     [].
 
@@ -1323,7 +1323,7 @@ compute_pid_group_dependencies(Groups) ->
                                           PG1 = PG0#{K => true},
                                           AccIn#{Pid => PG1}
                                   end, Acc, Cs)
-              end, #{}, Groups).
+         end, #{}, Groups).
 
 -spec compute_node_pid_group_dependencies(node(), groups()) -> pids_groups().
 compute_node_pid_group_dependencies(Node, Groups) ->
@@ -1357,4 +1357,3 @@ node_disconnected_timer_effect(Pid, T) ->
 
 ts() ->
     erlang:system_time(millisecond).
-