diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-09 16:06:39 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-09 16:06:39 +0100 |
| commit | 6520300813d6394733c8c6a5ee9e7145eed908b4 (patch) | |
| tree | 7b79e31f68fc63c04d00c67618bba519bc31d77d | |
| parent | 28062ca1238cd9b32a105494b457741c704fbf86 (diff) | |
| download | rabbitmq-server-6520300813d6394733c8c6a5ee9e7145eed908b4.tar.gz | |
Remove this master_changed nonsense.
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 40359da3..4d8b6ade 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -398,8 +398,6 @@ members_changed([_CPid], _Births, []) -> members_changed([CPid], _Births, Deaths) -> ok = gen_server2:cast(CPid, {gm_deaths, Deaths}). -handle_msg([_CPid], _From, master_changed) -> - ok; handle_msg([CPid], _From, request_depth = Msg) -> ok = gen_server2:cast(CPid, Msg); handle_msg([CPid], _From, {ensure_monitoring, _Pids} = Msg) -> diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 36f9766d..60d7ad0c 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -201,12 +201,6 @@ handle_call({gm_deaths, Deaths}, From, %% branch, see last clause in remove_from_queue/2 [] = ExtraNodes, erlang:monitor(process, Pid), - %% GM is lazy. So we know of the death of the - %% slave since it is a neighbour of ours, but - %% until a message is sent, not all members will - %% know. That might include the new master. So - %% broadcast a no-op message to wake everyone up. - ok = gm:broadcast(GM, master_changed), noreply(State #state { master_pid = Pid }) end end; @@ -345,8 +339,6 @@ joined([SPid], _Members) -> SPid ! {joined, self()}, ok. members_changed([_SPid], _Births, []) -> ok; members_changed([ SPid], _Births, Deaths) -> inform_deaths(SPid, Deaths). -handle_msg([_SPid], _From, master_changed) -> - ok; handle_msg([_SPid], _From, request_depth) -> %% This is only of value to the master ok; @@ -461,9 +453,6 @@ promote_me(From, #state { q = Q = #amqqueue { name = QName }, rabbit_mirror_queue_master:depth_fun()), true = unlink(GM), gen_server2:reply(From, {promote, CPid}), - %% TODO this has been in here since the beginning, but it's not - %% obvious if it is needed. Investigate... - ok = gm:confirmed_broadcast(GM, master_changed), %% Everything that we're monitoring, we need to ensure our new %% coordinator is monitoring. |