insert voter status in ets ra_state

Author: Alex Valiushko

src/ra_directory.erl

@@ -178,11 +178,13 @@ overview(System) when is_atom(System) ->
     States = maps:from_list(ets:tab2list(ra_state)),
     Snaps = maps:from_list(ets:tab2list(ra_log_snapshot_state)),
     lists:foldl(fun ({UId, Pid, Parent, ServerName, ClusterName}, Acc) ->
+                        {State, Voter} = maps:get(ServerName, States, {undefined, undefined}),
                         Acc#{ServerName =>
                              #{uid => UId,
                                pid => Pid,
                                parent => Parent,
-                               state => maps:get(ServerName, States, undefined),
+                               state => State,
+                               voter => Voter,
                                cluster_name => ClusterName,
                                snapshot_state => maps:get(UId, Snaps,
                                                           undefined)}}

src/ra_server.erl

@@ -1395,11 +1395,7 @@ overview(#{cfg := #cfg{effective_machine_module = MacMod} = Cfg,
                     cluster_index_term,
                     query_index
                    ], State),
-    % implicit voter status for initial leaders
-    O1 = case O0 of
-             #{voter := _} -> O0;
-             _             -> O0#{voter => yes}
-         end,
+    O1 = O0#{voter => maps:get(voter, O0, yes)}, % implicit voter for initial leaders
     O = maps:merge(O1, cfg_to_map(Cfg)),
     LogOverview = ra_log:overview(Log),
     MacOverview = ra_machine:overview(MacMod, MacState),

src/ra_server_proc.erl

@@ -783,9 +783,17 @@ follower(_, tick_timeout, State0) ->
      set_tick_timer(State, Actions)};
 follower({call, From}, {log_fold, Fun, Term}, State) ->
     fold_log(From, Fun, Term, State);
-follower(EventType, Msg, State0) ->
+follower(EventType, Msg, #state{conf = #conf{name = Name},
+                                server_state = SS0} = State0) ->
+    Voter0 = maps:get(voter, SS0, yes),
     case handle_follower(Msg, State0) of
-        {follower, State1, Effects} ->
+        {follower, #state{server_state = SS1} = State1, Effects} ->
+            case maps:get(voter, SS1, yes) of
+                Voter0 ->
+                    ok;
+                Voter ->
+                    true = ets:insert(ra_state, {Name, {follower, Voter}})
+            end,
             {State2, Actions} = ?HANDLE_EFFECTS(Effects, EventType, State1),
             State = follower_leader_change(State0, State2),
             {keep_state, State, Actions};
@@ -1028,7 +1036,8 @@ format_status(Opt, [_PDict, StateName,
 handle_enter(RaftState, OldRaftState,
              #state{conf = #conf{name = Name},
                     server_state = ServerState0} = State) ->
-    true = ets:insert(ra_state, {Name, RaftState}),
+    Voter = maps:get(voter, ServerState0, yes),
+    true = ets:insert(ra_state, {Name, {RaftState, Voter}}),
     {ServerState, Effects} = ra_server:handle_state_enter(RaftState,
                                                           ServerState0),
     case RaftState == leader orelse OldRaftState == leader of

test/ra_SUITE.erl

@@ -1040,7 +1040,12 @@ consistent_promotion(Config) ->
     validate_state_on_node(N3, 10),
     % nodes agree that all are voters after catch-up
     All = [N1, N2, N3],
-    lists:map(fun(O) ->
+    #{servers := Servers} = ra:overview(?SYS),
+    lists:map(fun({Name, _}) ->  % in ets
+                #{Name := #{voter := Voter}} = Servers,
+                ?assertEqual(yes, Voter)
+              end, All),
+    lists:map(fun(O) ->  % in server state
                 ?assert(is_voter(O)),
                 ?assertEqual(All, voters(O)),
                 ?assertEqual([], nonvoters(O))