khepri_remove_member

Author: dumbbell

deps/rabbit/src/rabbit_db.erl

@@ -198,9 +198,23 @@ force_load_on_next_boot_using_mnesia() ->
 post_reset() ->
     %% We assert all Ra systems are stopped because their files are about to
     %% be removed.
-    false = lists:any(
-              fun rabbit_ra_systems:is_running/1,
-              rabbit_ra_systems:all_ra_systems()),
+    lists:foreach(
+      fun(RaSystem) ->
+              case rabbit_ra_systems:is_running(RaSystem) of
+                  false ->
+                      ok;
+                  true ->
+                      Reason = rabbit_misc:format(
+                                 "Ra system '~s' is still running during "
+                                 "reset",
+                                 [RaSystem]),
+                      ?LOG_ERROR(
+                         "DB: ~ts",
+                         [Reason],
+                         #{domain => ?RMQLOG_DOMAIN_DB}),
+                      throw({error, Reason})
+              end
+      end, rabbit_ra_systems:all_ra_systems()),
 
     %% We reset the state of feature flags, both in memory and on disk. The
     %% state recorded on disk would be deleted with the wipe below anyway.

deps/rabbit/src/rabbit_khepri.erl

@@ -694,13 +694,8 @@ remove_reachable_member(NodeToRemove) ->
        [NodeToRemove, ?RA_CLUSTER_NAME],
        #{domain => ?RMQLOG_DOMAIN_GLOBAL}),
 
-    %% We need the Khepri store to run on the node to remove, to be
-    %% able to reset it.
-    ok = rabbit_misc:rpc_call(
-           NodeToRemove, ?MODULE, setup, []),
-
     Ret = rabbit_misc:rpc_call(
-            NodeToRemove, khepri_cluster, reset, [?RA_CLUSTER_NAME]),
+            NodeToRemove, rabbit_db, reset, []),
     case Ret of
         ok ->
             rabbit_amqqueue:forget_all(NodeToRemove),