summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-11-25 12:33:22 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-11-25 12:33:22 +0000
commita7da5b79f137abc3941b40cf80789359357a4348 (patch)
tree09c5808cca790af74e53296fdaaef1dd4f15f748
parent381cb31142fef840c42338ebdd92f03023ebef55 (diff)
downloadrabbitmq-server-a7da5b79f137abc3941b40cf80789359357a4348.tar.gz
Do not attempt to "fix up" the partitions field; if Mnesia does not detect the partition it will behave wrong anyway.
-rw-r--r--src/rabbit_node_monitor.erl8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index a4ae2a5e..fc82af0c 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -342,7 +342,7 @@ handle_cast({check_partial_partition, _Node, _Reporter,
{noreply, State};
handle_cast({partial_partition, NotReallyDown, Proxy, MyGUID},
- State = #state{guid = MyGUID, partitions = Partitions}) ->
+ State = #state{guid = MyGUID}) ->
FmtBase = "Partial partition detected:~n"
" * We saw DOWN from ~s~n"
" * We can still see ~s which can see ~s~n",
@@ -360,11 +360,7 @@ handle_cast({partial_partition, NotReallyDown, Proxy, MyGUID},
FmtBase ++ "We will therefore intentionally disconnect from ~s~n",
ArgsBase ++ [Proxy]),
erlang:disconnect_node(Proxy),
- %% In the event of explicitly disconnecting from a node,
- %% sometimes Mnesia does not log that we were partitioned
- %% - so note it here.
- Partitions1 = lists:usort([Proxy | Partitions]),
- {noreply, State#state{partitions = Partitions1}}
+ {noreply, State}
end;
handle_cast({partial_partition, _GUID, _Reporter, _Proxy}, State) ->