Skip to content

Commit c0d8ff1

Browse files
committed
forget_member
1 parent 4c306ab commit c0d8ff1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

deps/rabbit/src/rabbit_db_cluster.erl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,14 @@ forget_member_locked(Node, RemoveWhenOffline)
368368
"DB: removing cluster member `~ts`", [Node],
369369
#{domain => ?RMQLOG_DOMAIN_DB}),
370370
?assertNot(rabbit:is_running(Node)),
371-
Ret = case rabbit_khepri:is_enabled() of
372-
true -> forget_member_using_khepri(Node, RemoveWhenOffline);
373-
false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
374-
end,
375-
case Ret of
376-
ok -> post_forget_member_locked(Node, RemoveWhenOffline);
377-
_ -> ok
378-
end,
379-
Ret;
371+
try
372+
case rabbit_khepri:is_enabled() of
373+
true -> forget_member_using_khepri(Node, RemoveWhenOffline);
374+
false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
375+
end
376+
after
377+
post_forget_member_locked(Node, RemoveWhenOffline)
378+
end;
380379
forget_member_locked(Node, RemoveWhenOffline)
381380
when is_atom(Node) andalso Node =:= node() ->
382381
OtherNodes = members() -- [Node],

0 commit comments

Comments
 (0)