diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-06-25 16:03:30 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-06-25 16:03:30 +0100 |
| commit | f954714b4dd70d6f1b2f598773f82724b6153120 (patch) | |
| tree | 530abbc8cc0395f18305ad8a527187b5d10e6921 | |
| parent | 9ce01fded365bc954d0dec9c67c2149d1df8ae53 (diff) | |
| download | rabbitmq-server-f954714b4dd70d6f1b2f598773f82724b6153120.tar.gz | |
normal -> leaving the ring, change topology
shutdown -> ring shutting down, do not change topology
gm_tests now pass again.
| -rw-r--r-- | src/gm.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -664,7 +664,7 @@ handle_info({'DOWN', MRef, process, _Pid, Reason}, case {Member, Reason} of {undefined, _} -> noreply(State); - {_, normal} -> + {_, shutdown} -> noreply(State); _ -> View1 = diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 71e0507a..64756719 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -405,9 +405,9 @@ handle_msg([CPid], _From, request_length = Msg) -> ok = gen_server2:cast(CPid, Msg); handle_msg([CPid], _From, {ensure_monitoring, _Pids} = Msg) -> ok = gen_server2:cast(CPid, Msg); -handle_msg([CPid], _From, {delete_and_terminate, Reason} = Msg) -> +handle_msg([CPid], _From, {delete_and_terminate, _Reason} = Msg) -> ok = gen_server2:cast(CPid, Msg), - {stop, Reason}; + {stop, shutdown}; handle_msg([_CPid], _From, _Msg) -> ok. diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 2109bdd8..df5f35ad 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -351,9 +351,9 @@ handle_msg([_SPid], _From, {ensure_monitoring, _Pid}) -> ok; handle_msg([SPid], _From, {process_death, Pid}) -> inform_deaths(SPid, [Pid]); -handle_msg([CPid], _From, {delete_and_terminate, Reason} = Msg) -> +handle_msg([CPid], _From, {delete_and_terminate, _Reason} = Msg) -> ok = gen_server2:cast(CPid, {gm, Msg}), - {stop, Reason}; + {stop, shutdown}; handle_msg([SPid], _From, Msg) -> ok = gen_server2:cast(SPid, {gm, Msg}). |