diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 21 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 9 |
2 files changed, 6 insertions, 24 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index d7c93924..6ec7ee07 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1135,27 +1135,6 @@ <listitem><para>Number of consumers.</para></listitem> </varlistentry> <varlistentry> - <term>active_consumers</term> - <listitem> - <para> - Number of active consumers. An active consumer is - one which could immediately receive any messages - sent to the queue - i.e. it is not limited by its - prefetch count, TCP congestion, flow control, or - because it has issued channel.flow. At least one - of messages_ready and active_consumers must always - be zero. - </para> - <para> - Note that this value is an instantaneous snapshot - - when consumers are restricted by their prefetch - count they may only appear to be active for small - fractions of a second until more messages are sent - out. - </para> - </listitem> - </varlistentry> - <varlistentry> <term>memory</term> <listitem><para>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures.</para></listitem> diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index f2c8b211..ca495733 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -98,9 +98,10 @@ remove_from_queue(QueueName, Self, LiveGMPids) -> slave_pids = SPids1, gm_pids = GMPids1}, store_updated_slaves(Q1), - %% If we add and remove nodes at the same time - %% it's possible we need to sync after removing - %% the master. Let's check. + %% If we add and remove nodes at the same time we + %% might tell the old master we need to sync and + %% then shut it down. So let's check if the new + %% master needs to sync. maybe_auto_sync(Q1), {ok, QPid1, [QPid | SPids] -- Alive}; _ -> @@ -308,6 +309,8 @@ update_mirrors0(OldQ = #amqqueue{name = QName}, NewNodes = [NewMNode | NewSNodes], add_mirrors (QName, NewNodes -- OldNodes, async), drop_mirrors(QName, OldNodes -- NewNodes), + %% This is for the case where no extra nodes were added but we changed to + %% a policy requiring auto-sync. maybe_auto_sync(NewQ), ok. |