diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-11 13:36:45 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-11 13:36:45 +0100 |
| commit | 2d2ca544a47486fb82aacba442ac8fed57d1e40f (patch) | |
| tree | 4c20c0ab8aff4312f43b2b9c56851028afc8bbc2 | |
| parent | d55010f9d54b7f8cf338a49f0507809053988d09 (diff) | |
| download | rabbitmq-server-2d2ca544a47486fb82aacba442ac8fed57d1e40f.tar.gz | |
Report queue slave events by name rather than by QPid.
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index bae4df47..8ed2bede 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -343,7 +343,7 @@ handle_cast({gm_deaths, Deaths}, when node(MPid) =:= node() -> case rabbit_mirror_queue_misc:remove_from_queue(QueueName, Deaths) of {ok, MPid, DeadPids} -> - rabbit_mirror_queue_misc:report_deaths(MPid, true, QueueName, MPid, + rabbit_mirror_queue_misc:report_deaths(MPid, true, QueueName, DeadPids), noreply(State); {error, not_found} -> diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 079a9f1a..cf8e9484 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -18,7 +18,7 @@ -export([remove_from_queue/2, on_node_up/0, drop_mirror/2, drop_mirror/3, add_mirror/2, add_mirror/3, - report_deaths/5]). + report_deaths/4]). -include("rabbit.hrl"). @@ -136,11 +136,11 @@ if_mirrored_queue(Queue, Fun) -> end end). -report_deaths(_MirrorPid, _IsMaster, _QueueName, _OldMPid, []) -> +report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; -report_deaths(MirrorPid, IsMaster, QueueName, OldMPid, DeadPids) -> - rabbit_event:notify(queue_mirror_deaths, [{master_pid, OldMPid}, - {pids, DeadPids}]), +report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) -> + rabbit_event:notify(queue_mirror_deaths, [{name, QueueName}, + {pids, DeadPids}]), rabbit_log:info("Mirrored-queue (~s): ~s ~s saw deaths of mirrors ~s~n", [rabbit_misc:rs(QueueName), case IsMaster of diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 2ec3a97a..ad7f64c9 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -172,7 +172,7 @@ handle_call({gm_deaths, Deaths}, From, {stop, normal, State}; {ok, Pid, DeadPids} -> rabbit_mirror_queue_misc:report_deaths(self(), false, QueueName, - MPid, DeadPids), + DeadPids), if node(Pid) =:= node(MPid) -> %% master hasn't changed reply(ok, State); @@ -429,8 +429,8 @@ promote_me(From, #state { q = Q = #amqqueue { name = QName }, msg_id_status = MS, known_senders = KS, master_pid = MPid}) -> - rabbit_event:notify(queue_slave_promoted, [{pid, self()}, - {old_pid, MPid}]), + rabbit_event:notify(queue_slave_promoted, [{pid, self()}, + {name, QName}]), rabbit_log:info("Mirrored-queue (~s): Promoting slave ~s to master~n", [rabbit_misc:rs(QName), rabbit_misc:pid_to_string(self())]), Q1 = Q #amqqueue { pid = self() }, @@ -897,10 +897,10 @@ maybe_store_ack(true, MsgId, AckTag, State = #state { msg_id_ack = MA, %% We intentionally leave out the head where a slave becomes %% unsynchronised: we assert that can never happen. -set_synchronised(true, State = #state { master_pid = MasterPid, - synchronised = false }) -> - rabbit_event:notify(queue_slave_synchronised, [{master_pid, MasterPid}, - {pid, self()}]), +set_synchronised(true, State = #state {q = #amqqueue {name = QName}, + synchronised = false }) -> + rabbit_event:notify(queue_slave_synchronised, [{pid, self()}, + {name, QName}]), State #state { synchronised = true }; set_synchronised(true, State) -> State; |