Restart Ra systems [WIP, not enough]

rabbitmq · Jan 22, 2024 · ab671b7 · ab671b7
1 parent 9975c68
commit ab671b7
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/deps/rabbit/src/rabbit_db_cluster.erl b/deps/rabbit/src/rabbit_db_cluster.erl
@@ -229,9 +229,18 @@ forget_member(Node, RemoveWhenOffline) ->
             ?LOG_DEBUG(
                "DB: removing cluster member `~ts`", [Node],
                #{domain => ?RMQLOG_DOMAIN_DB}),
-            case rabbit_khepri:is_enabled() of
-                true  -> forget_member_using_khepri(Node, RemoveWhenOffline);
-                false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
+            {ok, _} = erpc:call(Node, application, ensure_all_started, [ra]),
+            ok = erpc:call(Node, rabbit_ra_systems, ensure_started, []),
+            try
+                case rabbit_khepri:is_enabled() of
+                    true ->
+                        forget_member_using_khepri(Node, RemoveWhenOffline);
+                    false ->
+                        forget_member_using_mnesia(Node, RemoveWhenOffline)
+                end
+            after
+                      catch erpc:call(
+                              Node, rabbit_ra_systems, ensure_stopped, [])
             end;
         true ->
             {error, {failed_to_remove_node, Node, rabbit_still_running}}