diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-26 16:34:30 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-26 16:34:30 +0100 |
| commit | 735ff076a50ced32157b56cba2a6db5ce649ef67 (patch) | |
| tree | 6ae316a41bd50da2c9e4f0d3b9c3b5f4f4ec83eb | |
| parent | 54fd0701e1e2fcba4c2aa7def75622f641f2e23c (diff) | |
| download | rabbitmq-server-git-735ff076a50ced32157b56cba2a6db5ce649ef67.tar.gz | |
Let's try that again: we no longer need to use confirmed_broadcast here due to lack of immediate.
| -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 9e98c72666..d447f1f322 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, false}), {AckTag, BQS1} = BQ:publish_delivered(AckRequired, Msg, MsgProps, ChPid, BQS), |