Use only tick to refresh SAC coordinator configuration

Do not use RA init at all.

Author: acogoluegnes

deps/rabbit/src/rabbit_stream_coordinator.erl

@@ -536,10 +536,9 @@ version() -> 5.
 which_module(_) ->
     ?MODULE.
 
-init(#{machine_version := MacVersion} = Conf) when MacVersion >= 5 ->
-    SacConf = maps:get(sac_conf, Conf, #{}),
+init(#{machine_version := MacVersion}) when MacVersion >= 5 ->
     #?MODULE{single_active_consumer =
-             rabbit_stream_sac_coordinator:init_state(SacConf)};
+             rabbit_stream_sac_coordinator:init_state()};
 init(_) ->
     #?MODULE{single_active_consumer = rabbit_stream_sac_coordinator_v4:init_state()}.
 
@@ -1364,15 +1363,10 @@ make_ra_conf(Node, Nodes, MinMacVersion) ->
       initial_members => Members,
       log_init_args => #{uid => UId},
       tick_timeout => TickTimeout,
-      machine => {module, ?MODULE, #{sac_conf => make_sac_conf(MinMacVersion)}},
+      machine => {module, ?MODULE, #{}},
       initial_machine_version => MinMacVersion,
       ra_event_formatter => Formatter}.
 
-make_sac_conf(MinMacVersion) when MinMacVersion >= 5 ->
-    sac_make_conf();
-make_sac_conf(_) ->
-    #{}.
-
 filter_command(_Meta, {delete_replica, _, #{node := Node}}, #stream{id = StreamId,
                                                                     members = Members0}) ->
     Members = maps:filter(fun(_, #member{target = S}) when S =/= deleted ->
@@ -2450,9 +2444,6 @@ maps_to_list(M) ->
 ra_local_query(QueryFun) ->
     ra:local_query({?MODULE, node()}, QueryFun, infinity).
 
-sac_make_conf() ->
-    rabbit_stream_sac_coordinator:make_conf().
-
 sac_make_purge_nodes(Nodes) ->
     rabbit_stream_sac_coordinator:make_purge_nodes(Nodes).
 

deps/rabbit/src/rabbit_stream_sac_coordinator.erl

@@ -38,7 +38,7 @@
          group_consumers/4,
          connection_reconnected/1]).
 -export([apply/2,
-         init_state/1,
+         init_state/0,
          send_message/2,
          ensure_monitors/4,
          handle_connection_down/2,
@@ -49,7 +49,6 @@
          group_consumers/5,
          overview/1,
          import_state/2,
-         make_conf/0,
          check_conf_change/1]).
 -export([make_purge_nodes/1,
          make_update_conf/1]).
@@ -201,10 +200,9 @@ overview(#?MODULE{groups = Groups}) ->
                  Groups),
     #{num_groups => map_size(Groups), groups => GroupsOverview}.
 
--spec init_state(map()) -> state().
-init_state(Conf) ->
-    DisconTimeout = maps:get(?DISCONNECTED_TIMEOUT_CONF_KEY, Conf,
-                             ?DISCONNECTED_TIMEOUT_MS),
+-spec init_state() -> state().
+init_state() ->
+    DisconTimeout = ?DISCONNECTED_TIMEOUT_MS,
     #?MODULE{groups = #{}, pids_groups = #{},
              conf = #{?DISCONNECTED_TIMEOUT_CONF_KEY => DisconTimeout}}.
 
@@ -863,10 +861,6 @@ import_state(4, #{<<"groups">> := Groups, <<"pids_groups">> := PidsGroups}) ->
              pids_groups = map_to_pids_groups(PidsGroups),
              conf = #{disconnected_timeout => ?DISCONNECTED_TIMEOUT_MS}}.
 
--spec make_conf() -> conf().
-make_conf() ->
-    #{?DISCONNECTED_TIMEOUT_CONF_KEY => lookup_disconnected_timeout()}.
-
 -spec check_conf_change(state()) -> {new, conf()} | unchanged.
 check_conf_change(#?MODULE{conf = Conf}) ->
     DisconTimeout = lookup_disconnected_timeout(),