rabbit_db_cluster: generate left cluster notifications

They must be sent during reset and when leaving the cluster for
any metadata store

(cherry picked from commit db03d8c)

Author: dcorbacho

deps/rabbit/src/rabbit_db_cluster.erl

@@ -151,6 +151,8 @@ join(RemoteNode, NodeType)
                 false -> ok = rabbit_mnesia:reset_gracefully()
             end,
 
+            ok = rabbit_node_monitor:notify_left_cluster(node()),
+
             %% Now that the files are all gone after the reset above, restart
             %% the Ra systems. They will recreate their folder in the process.
             case RestartRabbit of
@@ -225,6 +227,14 @@ join_using_khepri(_ClusterNodes, ram = NodeType) ->
 %% @doc Removes `Node' from the cluster.
 
 forget_member(Node, RemoveWhenOffline) ->
+    case forget_member0(Node, RemoveWhenOffline) of
+        ok ->
+            rabbit_node_monitor:notify_left_cluster(Node);
+        Error ->
+            Error
+    end.
+
+forget_member0(Node, RemoveWhenOffline) ->
     case rabbit:is_running(Node) of
         false ->
             ?LOG_DEBUG(

deps/rabbit/src/rabbit_khepri.erl

@@ -425,13 +425,7 @@ post_add_member(JoiningNode, JoinedNode, Error) ->
 %% @private
 
 leave_cluster(Node) ->
-    case retry_khepri_op(fun() -> remove_member(Node) end, 60) of
-        ok ->
-            rabbit_event:notify(node_deleted, [{node, Node}]),
-            ok;
-        Any ->
-            Any
-    end.
+    retry_khepri_op(fun() -> remove_member(Node) end, 60).
 
 %% @private
 

deps/rabbit/src/rabbit_mnesia.erl

@@ -293,9 +293,6 @@ change_cluster_node_type(Type) ->
 -spec forget_cluster_node(node(), boolean()) -> 'ok'.
 
 forget_cluster_node(Node, RemoveWhenOffline) ->
-    forget_cluster_node(Node, RemoveWhenOffline, true).
-
-forget_cluster_node(Node, RemoveWhenOffline, EmitNodeDeletedEvent) ->
     case lists:member(Node, cluster_nodes(all)) of
         true  -> ok;
         false -> e(not_a_cluster_node)
@@ -307,9 +304,6 @@ forget_cluster_node(Node, RemoveWhenOffline, EmitNodeDeletedEvent) ->
         {false,  true} -> rabbit_log:info(
                             "Removing node ~tp from cluster", [Node]),
                           case remove_node_if_mnesia_running(Node) of
-                              ok when EmitNodeDeletedEvent ->
-                                  rabbit_event:notify(node_deleted, [{node, Node}]),
-                                  ok;
                               ok               -> ok;
                               {error, _} = Err -> throw(Err)
                           end
@@ -333,7 +327,7 @@ remove_node_offline_node(Node) ->
                 %% We skip the 'node_deleted' event because the
                 %% application is stopped and thus, rabbit_event is not
                 %% enabled.
-                forget_cluster_node(Node, false, false),
+                forget_cluster_node(Node, false),
                 force_load_next_boot()
             after
                 stop_mnesia()
@@ -893,7 +887,6 @@ remove_node_if_mnesia_running(Node) ->
             case mnesia:del_table_copy(schema, Node) of
                 {atomic, ok} ->
                     rabbit_amqqueue:forget_all_durable(Node),
-                    rabbit_node_monitor:notify_left_cluster(Node),
                     ok;
                 {aborted, Reason} ->
                     {error, {failed_to_remove_node, Node, Reason}}

deps/rabbit/src/rabbit_node_monitor.erl

@@ -620,6 +620,7 @@ handle_cast({left_cluster, Node}, State) ->
               {del_node(Node, AllNodes), del_node(Node, DiscNodes),
                del_node(Node, RunningNodes)})
     end,
+    rabbit_event:notify(node_deleted, [{node, Node}]),
     {noreply, State};
 
 handle_cast({subscribe, Pid}, State = #state{subscribers = Subscribers}) ->