diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-01-27 16:16:45 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-01-27 16:16:45 +0300 |
| commit | 6aba71548f60227d2d927facdbe9e8f0c529ab86 (patch) | |
| tree | b3795f8f47caa7277fa2807ff6ac7ce8ad2106d4 /src | |
| parent | dc6cb6ba63c1df13e9d461ab50baf2416ce733f8 (diff) | |
| parent | 9af509002ca4d7634d845844571cf30385584efa (diff) | |
| download | rabbitmq-server-git-6aba71548f60227d2d927facdbe9e8f0c529ab86.tar.gz | |
Merge branch 'stable' into rabbitmq-server-541
Diffstat (limited to 'src')
| -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 |