summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Parra Corbacho <dparracorbac@vmware.com>2023-04-13 08:22:34 +0200
committerDiana Parra Corbacho <dparracorbac@vmware.com>2023-05-12 11:31:16 +0200
commit6408f253c0cdfa82da339264f57a8ae9b1897341 (patch)
treea40f3156a467a254f1e603b760b261edf1981371
parent955bfd333a3c33dfc8a010e1c4ee4a6d47578c1a (diff)
downloadrabbitmq-server-git-6408f253c0cdfa82da339264f57a8ae9b1897341.tar.gz
Khepri: remove wait_for_leader
-rw-r--r--deps/rabbit/src/rabbit_khepri.erl38
1 files changed, 0 insertions, 38 deletions
diff --git a/deps/rabbit/src/rabbit_khepri.erl b/deps/rabbit/src/rabbit_khepri.erl
index 61da3a3cfb..4aace06a5a 100644
--- a/deps/rabbit/src/rabbit_khepri.erl
+++ b/deps/rabbit/src/rabbit_khepri.erl
@@ -122,7 +122,6 @@ setup(_) ->
friendly_name => ?RA_FRIENDLY_NAME},
case khepri:start(?RA_SYSTEM, RaServerConfig) of
{ok, ?STORE_ID} ->
- wait_for_leader(),
register_projections(),
?LOG_DEBUG(
"Khepri-based " ?RA_FRIENDLY_NAME " ready",
@@ -132,43 +131,6 @@ setup(_) ->
exit(Error)
end.
-wait_for_leader() ->
- wait_for_leader(retry_timeout(), retry_limit()).
-
-retry_timeout() ->
- case application:get_env(rabbit, khepri_leader_wait_retry_timeout) of
- {ok, T} -> T;
- undefined -> 30000
- end.
-
-retry_limit() ->
- case application:get_env(rabbit, khepri_leader_wait_retry_limit) of
- {ok, T} -> T;
- undefined -> 10
- end.
-
-wait_for_leader(_Timeout, 0) ->
- exit(timeout_waiting_for_leader);
-wait_for_leader(Timeout, Retries) ->
- rabbit_log:info("Waiting for Khepri leader for ~tp ms, ~tp retries left",
- [Timeout, Retries - 1]),
- case ra_leaderboard:lookup_leader(?STORE_ID) of
- undefined ->
- timer:sleep(Timeout),
- wait_for_leader(Timeout, Retries - 1);
- Id ->
- case ra:members(Id, Timeout) of
- {error, noproc} ->
- timer:sleep(Timeout),
- wait_for_leader(Timeout, Retries - 1);
- {timeout, _} ->
- wait_for_leader(Timeout, Retries - 1);
- {_, _, {_, NewNode}} ->
- rabbit_log:info("Khepri leader elected: ~p", [NewNode]),
- ok
- end
- end.
-
add_member(JoiningNode, JoinedNode)
when JoiningNode =:= node() andalso is_atom(JoinedNode) ->
Ret = do_join(JoinedNode),