Skip to content

mirrored_supervisor: Catch timeout from Khepri in hanlde_info/2 #12853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 29, 2024
Merged

mirrored_supervisor: Catch timeout from Khepri in hanlde_info/2 #12853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913bd9f
rabbit_db: Fix `rabbit_db_msup:update_all/2` spec
dumbbell Nov 27, 2024
4621fe7
mirrored_supervisor: Catch timeout from Khepri in `hanlde_info/2`
dumbbell Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion deps/rabbit/src/mirrored_supervisor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ handle_info({'DOWN', _Ref, process, Pid, _Reason},
child_order = ChildOrder}) ->
%% No guarantee pg will have received the DOWN before us.
R = case lists:sort(pg:get_members(Group)) -- [Pid] of
[O | _] -> ChildSpecs = update_all(O, Pid),
[O | _] -> ChildSpecs = retry_update_all(O, Pid),
[start(Delegate, ChildSpec)
|| ChildSpec <- restore_child_order(ChildSpecs,
ChildOrder)];
Expand Down Expand Up @@ -428,6 +428,22 @@ check_stop(Group, Delegate, Id) ->

id({Id, _, _, _, _, _}) -> Id.

retry_update_all(O, Pid) ->
retry_update_all(O, Pid, 10000).

retry_update_all(O, Pid, TimeLeft) when TimeLeft > 0 ->
case update_all(O, Pid) of
List when is_list(List) ->
List;
{error, timeout} ->
Sleep = 200,
TimeLeft1 = TimeLeft - Sleep,
timer:sleep(Sleep),
retry_update_all(O, Pid, TimeLeft1)
end;
retry_update_all(O, Pid, _TimeLeft) ->
update_all(O, Pid).

update_all(Overall, OldOverall) ->
rabbit_db_msup:update_all(Overall, OldOverall).

Expand Down
5 changes: 3 additions & 2 deletions deps/rabbit/src/rabbit_db_msup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,10 @@ find_mirror_in_khepri(Group, Id) ->
%% update_all().
%% -------------------------------------------------------------------

-spec update_all(Overall, Overall) -> [ChildSpec] when
-spec update_all(Overall, Overall) -> [ChildSpec] | Error when
Overall :: pid(),
ChildSpec :: supervisor2:child_spec().
ChildSpec :: supervisor2:child_spec(),
Error :: {error, any()}.

update_all(Overall, OldOverall) ->
rabbit_khepri:handle_fallback(
Expand Down
Loading