diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 1e6184fd8c..25e5a56d42 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -1522,7 +1522,7 @@ wait_for_promoted_or_stopped(Q0) -> case lists:any(fun(Pid) -> rabbit_mnesia:is_process_alive(Pid) end, SPids) of - %% There is a live slave. May be promoted + %% There is a live mirror. May be promoted true -> timer:sleep(100), wait_for_promoted_or_stopped(Q); diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index e1baca462b..2e519b1e92 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -451,7 +451,7 @@ is_duplicate(Message = #basic_message { id = MsgId }, backing_queue_state = BQS, confirmed = Confirmed }) -> %% Here, we need to deal with the possibility that we're about to - %% receive a message that we've already seen when we were a slave + %% receive a message that we've already seen when we were a mirror %% (we received it via gm). Thus if we do receive such message now %% via the channel, there may be a confirm waiting to issue for %% it. @@ -478,12 +478,12 @@ is_duplicate(Message = #basic_message { id = MsgId }, %% confirmed some time after that (maybe even after %% promotion), but before we received the publish from the %% channel, so couldn't previously know what the - %% msg_seq_no was (and thus confirm as a slave). So we + %% msg_seq_no was (and thus confirm as a mirror). So we %% need to confirm now. As above, amqqueue_process will %% have the entry for the msg_id_to_channel mapping added %% immediately after calling is_duplicate/2. orelse Disposition =:= discarded -> - %% Message was discarded while we were a slave. Confirm now. + %% Message was discarded while we were a mirror. Confirm now. %% As above, amqqueue_process will have the entry for the %% msg_id_to_channel mapping. {{true, drop}, State #state { seen_status = maps:remove(MsgId, SS), diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 8a8151730f..7c592dab9c 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -797,7 +797,7 @@ confirm_sender_death(Pid) -> Fun = fun (?MODULE, State = #state { known_senders = KS, gm = GM }) -> - %% We're running still as a slave + %% We're running still as a mirror %% %% See comment in local_sender_death/2; we might have %% received a sender_death in the meanwhile so check |