Avoid using unfortunate terms in code comments and log messages

We have switched all doc guides to use "mirror" or "secondary replica"
years ago but these were never updated.

Renaming functions and record/HTTP API fields (including CLI tools)
would be major a breaking change, so they will be aliased or renamed
with a lot more extensive review in the future.

4 files changed, 16 insertions, 16 deletions

diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl
index d5e9700b66..15770ca41f 100644
--- a/test/dynamic_ha_SUITE.erl
+++ b/test/dynamic_ha_SUITE.erl
@@ -444,7 +444,7 @@ nodes_policy_should_pick_master_from_its_params(Config) ->
     LastSlave = node(lists:last(SSPids)),
     ?assertEqual(true, apply_policy_to_declared_queue(Config, Ch, [A],
         [{nodes, [LastSlave]}])),
-    %% --> Master: B or C (depends on the order of current slaves)
+    %% --> Master: B or C (depends on the order of current mirrors )
     %%     Slaves: []
 
     %% Now choose a new master that isn't synchronised. The previous
@@ -452,8 +452,8 @@ nodes_policy_should_pick_master_from_its_params(Config) ->
     %% from the initial synchronised list). Thus, by taking the first
     %% node from this list, we know it is not synchronised.
     %%
-    %% Because the policy doesn't cover any synchronised slave, RabbitMQ
-    %% should instead use an existing synchronised slave as the new master,
+    %% Because the policy doesn't cover any synchronised mirror, RabbitMQ
+    %% should instead use an existing synchronised mirror as the new master,
     %% even though that isn't in the policy.
     ?assertEqual(true, apply_policy_to_declared_queue(Config, Ch, [A],
         [{nodes, [LastSlave, A]}])),
@@ -559,7 +559,7 @@ failing_random_policies(Config) ->
           undefined, {exactly, 3}, all])).
 
 promote_slave_after_standalone_restart(Config) ->
-    %% Tests that slaves can be brought up standalone after forgetting the rest
+    %% Tests that mirrors can be brought up standalone after forgetting the rest
     %% of the cluster. Slave ordering should be irrelevant.
     %% https://github.com/rabbitmq/rabbitmq-server/issues/1213
     [A, B, C] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
diff --git a/test/many_node_ha_SUITE.erl b/test/many_node_ha_SUITE.erl
index 6f3bc49de7..d71b6214d5 100644
--- a/test/many_node_ha_SUITE.erl
+++ b/test/many_node_ha_SUITE.erl
@@ -103,7 +103,7 @@ kill_intermediate(Config) ->
     ProducerPid = rabbit_ha_test_producer:create(ProducerChannel,
                                                  Queue, self(), false, Msgs),
 
-    %% create a killer for the master and the first 3 slaves
+    %% create a killer for the master and the first 3 mirrors
     [rabbit_ct_broker_helpers:kill_node_after(Config, Node, Time) ||
         {Node, Time} <- [{A, 50},
                          {B, 50},
diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl
index 541a52ff24..8a2e53a06d 100644
--- a/test/priority_queue_SUITE.erl
+++ b/test/priority_queue_SUITE.erl
@@ -459,7 +459,7 @@ mirror_queue_sync(Config) ->
 
 mirror_queue_sync_priority_above_max(Config) ->
     A = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
-    %% Tests synchronisation of slaves when priority is higher than max priority.
+    %% Tests synchronisation of mirrors when priority is higher than max priority.
     %% This causes an infinity loop (and test timeout) before rabbitmq-server-795
     {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, A),
     Q = <<"mirror_queue_sync_priority_above_max-queue">>,
@@ -476,7 +476,7 @@ mirror_queue_sync_priority_above_max(Config) ->
 
 mirror_queue_sync_priority_above_max_pending_ack(Config) ->
     [A, B] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
-    %% Tests synchronisation of slaves when priority is higher than max priority
+    %% Tests synchronisation of mirrors when priority is higher than max priority
     %% and there are pending acks.
     %% This causes an infinity loop (and test timeout) before rabbitmq-server-795
     {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, A),
@@ -499,9 +499,9 @@ mirror_queue_sync_priority_above_max_pending_ack(Config) ->
 
 mirror_queue_auto_ack(Config) ->
     A = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
-    %% Check correct use of AckRequired in the notifications to the slaves.
-    %% If slaves are notified with AckRequired == true when it is false,
-    %% the slaves will crash with the depth notification as they will not
+    %% Check correct use of AckRequired in the notifications to the mirrors.
+    %% If mirrors are notified with AckRequired == true when it is false,
+    %% the mirrors will crash with the depth notification as they will not
     %% match the master delta.
     %% Bug rabbitmq-server 687
     {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, A),
@@ -512,11 +512,11 @@ mirror_queue_auto_ack(Config) ->
       <<".*">>, <<"all">>),
     get_partial(Ch, Q, no_ack, [3, 2, 1]),
 
-    %% Retrieve slaves
+    %% Retrieve mirrors
     SPids = slave_pids(Config, A, rabbit_misc:r(<<"/">>, queue, Q)),
     [{SNode1, _SPid1}, {SNode2, SPid2}] = nodes_and_pids(SPids),
 
-    %% Restart one of the slaves so `request_depth` is triggered
+    %% Restart one of the mirrors so `request_depth` is triggered
     rabbit_ct_broker_helpers:restart_node(Config, SNode1),
 
     %% The alive slave must have the same pid after its neighbour is restarted
diff --git a/test/simple_ha_SUITE.erl b/test/simple_ha_SUITE.erl
index 10d8eda9ee..528c5f1cf9 100644
--- a/test/simple_ha_SUITE.erl
+++ b/test/simple_ha_SUITE.erl
@@ -121,7 +121,7 @@ rapid_redeclare(Config) ->
      end || _I <- lists:seq(1, 20)],
     ok.
 
-%% Check that by the time we get a declare-ok back, the slaves are up
+%% Check that by the time we get a declare-ok back, the mirrors are up
 %% and in Mnesia.
 declare_synchrony(Config) ->
     [Rabbit, Hare] = rabbit_ct_broker_helpers:get_node_configs(Config,
@@ -222,7 +222,7 @@ consume_survives(Config,
     Channel2 = rabbit_ct_client_helpers:open_channel(Config, B),
     Channel3 = rabbit_ct_client_helpers:open_channel(Config, C),
 
-    %% declare the queue on the master, mirrored to the two slaves
+    %% declare the queue on the master, mirrored to the two mirrors
     Queue = <<"test">>,
     amqp_channel:call(Channel1, #'queue.declare'{queue       = Queue,
                                                  auto_delete = false}),
@@ -253,7 +253,7 @@ confirms_survive(Config, DeathFun) ->
     Node1Channel = rabbit_ct_client_helpers:open_channel(Config, A),
     Node2Channel = rabbit_ct_client_helpers:open_channel(Config, B),
 
-    %% declare the queue on the master, mirrored to the two slaves
+    %% declare the queue on the master, mirrored to the two mirrors
     Queue = <<"test">>,
     amqp_channel:call(Node1Channel,#'queue.declare'{queue       = Queue,
                                                     auto_delete = false,
@@ -288,7 +288,7 @@ rejects_survive(Config, DeathFun) ->
     Node1Channel = rabbit_ct_client_helpers:open_channel(Config, A),
     Node2Channel = rabbit_ct_client_helpers:open_channel(Config, B),
 
-    %% declare the queue on the master, mirrored to the two slaves
+    %% declare the queue on the master, mirrored to the two mirrors
     XOverflow = ?config(overflow, Config),
     Queue = <<"test_rejects", "_", XOverflow/binary>>,
     amqp_channel:call(Node1Channel,#'queue.declare'{queue       = Queue,