WIP

Author: dumbbell

deps/rabbit/src/rabbit_db_cluster.erl

@@ -469,21 +469,26 @@ forget_member_locked(Node, RemoveWhenOffline)
        "DB: removing cluster member `~ts`", [Node],
        #{domain => ?RMQLOG_DOMAIN_DB}),
     ?assertNot(rabbit:is_running(Node)),
-    case rabbit_khepri:is_enabled() of
-        true  -> forget_member_using_khepri(Node, RemoveWhenOffline);
-        false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
+    Ret = case rabbit_khepri:is_enabled() of
+              true  -> forget_member_using_khepri(Node, RemoveWhenOffline);
+              false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
+          end,
+    case Ret of
+        ok ->
+            post_forget_member_locked(Node, RemoveWhenOffline);
+        _ ->
+            ok
     end,
-
-    post_forget_member_locked(Node, RemoveWhenOffline).
+    Ret.
 
 post_forget_member_locked(Node, false = _RemoveWhenOffline) ->
     ?LOG_DEBUG(
        "DB: removing node `~s` from various Ra clusters", [Node],
        #{domain => ?RMQLOG_DOMAIN_DB}),
-    rabbit_amqqueue:forget_all(Node),
-    rabbit_quorum_queue:shrink_all(Node),
-    rabbit_stream_queue:delete_all_replicas(Node),
-    rabbit_stream_coordinator:forget_node(Node),
+    _ = rabbit_amqqueue:forget_all(Node),
+    _ = rabbit_quorum_queue:shrink_all(Node),
+    _ = rabbit_stream_queue:delete_all_replicas(Node),
+    _ = rabbit_stream_coordinator:forget_node(Node),
     rabbit_node_monitor:notify_left_cluster(Node),
     ok;
 post_forget_member_locked(_Node, true = _RemoveWhenOffline) ->