diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-24 17:53:33 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-24 17:53:33 +0100 |
| commit | e542da0a5b29f5df74e8fd0ae12d435f3b199f18 (patch) | |
| tree | bb516588d839916453502a5eade7aff35c97f70f | |
| parent | 4db1f439da5b7da45ca27da1f3533948924bd667 (diff) | |
| download | rabbitmq-server-git-e542da0a5b29f5df74e8fd0ae12d435f3b199f18.tar.gz | |
No longer need confirmed_broadcast if immediate no longer exists.
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index c11a8ff7c0..10f60c535a 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -170,10 +170,7 @@ publish_delivered(AckRequired, Msg = #basic_message { id = MsgId }, MsgProps, backing_queue_state = BQS, ack_msg_id = AM }) -> false = dict:is_key(MsgId, SS), %% ASSERTION - %% Must use confirmed_broadcast here in order to guarantee that - %% all slaves are forced to interpret this publish_delivered at - %% the same point, especially if we die and a slave is promoted. - ok = gm:confirmed_broadcast( + ok = gm:broadcast( GM, {publish, {true, AckRequired}, ChPid, MsgProps, Msg}), {AckTag, BQS1} = BQ:publish_delivered(AckRequired, Msg, MsgProps, ChPid, BQS), |