diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-08-24 11:33:03 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-08-24 11:33:09 +0300 |
| commit | 69bf942356aa0282ec2cab5073eccac01cfe0950 (patch) | |
| tree | 941348046f862f90e1bbb1ab50a1a5d585115bc7 /src | |
| parent | 484db84679351fd7137aadcd1d9083750490194a (diff) | |
| download | rabbitmq-server-git-69bf942356aa0282ec2cab5073eccac01cfe0950.tar.gz | |
Naming, wording
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_node_monitor.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 7c478555ad..bea2a3fa96 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -336,12 +336,12 @@ init([]) -> process_flag(trap_exit, true), net_kernel:monitor_nodes(true, [nodedown_reason]), {ok, _} = mnesia:subscribe(system), - %% If the node has been restarted, mnesia can trigger a system notification - %% before the monitors subscribes. To avoid autoheal blocking because - %% the inconsistent database event never arrives (thus handling of down - %% rabbits), we'll monitor any running nodes from startup. The rest of - %% the monitoring ops will only be triggered when notifications arrive. - Nodes = might_be_partitioned_nodes(), + %% If the node has been restarted, Mnesia can trigger a system notification + %% before the monitor subscribes to receive them. To avoid autoheal blocking due to + %% the inconsistent database event never arriving, we being monitoring all running + %% nodes as early as possible. The rest of the monitoring ops will only be triggered + %% when notifications arrive. + Nodes = possibly_partitioned_nodes(), startup_log(Nodes), Monitors = lists:foldl(fun(Node, Monitors0) -> pmon:monitor({rabbit, Node}, Monitors0) @@ -886,7 +886,7 @@ ping_all() -> [net_adm:ping(N) || N <- rabbit_mnesia:cluster_nodes(all)], ok. -might_be_partitioned_nodes() -> +possibly_partitioned_nodes() -> alive_rabbit_nodes() -- rabbit_mnesia:cluster_nodes(running). startup_log([]) -> |