diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-05-12 12:45:19 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-05-12 12:45:19 +0100 |
| commit | 259b8cef38e4c27d9b93c5a6ff9c42f172e5e9c0 (patch) | |
| tree | d8d3fed18a81cc826dfe0106bd831df772c18d3d | |
| parent | bfa27a8bbc72dd0c2b5b414c6dad401bcd8638f8 (diff) | |
| download | rabbitmq-server-bug26150.tar.gz | |
Cosmetic, and log a warningbug26150
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 74c03e64..23718da1 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -410,7 +410,7 @@ handle_msg([CPid], _From, request_depth = 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, {shutdown, ring_shutdown}}; handle_msg([_CPid], _From, _Msg) -> diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 792cebd1..24b22d4c 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -181,6 +181,9 @@ terminate(Reason, case SSPids =:= [] andalso rabbit_policy:get(<<"ha-promote-on-shutdown">>, Q) =/= <<"always">> of true -> %% Remove the whole queue to avoid data loss + rabbit_mirror_queue_misc:log_warning( + QName, "Stopping all nodes on master shutdown since no " + "synchronised slave is available~n", []), stop_all_slaves(Reason, State); false -> %% Just let some other slave take over. ok |