diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-01-27 05:26:10 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-01-27 05:26:10 -0800 |
| commit | eae87229e6a115fe4d491cc4d878e4257a81215a (patch) | |
| tree | f64c077c3f6706133dab3c6b48c1ad5d08dca8a6 | |
| parent | e4c84b0d11cc733057c317b06b2eae6bebee4164 (diff) | |
| parent | 9af509002ca4d7634d845844571cf30385584efa (diff) | |
| download | rabbitmq-server-git-eae87229e6a115fe4d491cc4d878e4257a81215a.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 4556f72e78..057a4fad31 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -212,7 +212,15 @@ stop_all_slaves(Reason, #state{name = QName, gm = GM}) -> %% monitor them but they would not have received the GM %% message. So only wait for slaves which are still %% not-partitioned. - [receive {'DOWN', MRef, process, _Pid, _Info} -> ok end + [receive + {'DOWN', MRef, process, _Pid, _Info} -> + ok + after 15000 -> + rabbit_mirror_queue_misc:log_warning( + QName, "Missing 'DOWN' message from ~p in node ~p~n", + [Pid, node(Pid)]), + ok + end || {Pid, MRef} <- PidsMRefs, rabbit_mnesia:on_running_node(Pid)], %% Normally when we remove a slave another slave or master will %% notice and update Mnesia. But we just removed them all, and |