Merge remote-tracking branch 'origin' into rabbitmq-server-1229

3 files changed, 29 insertions, 28 deletions

diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index b527b816b1..69e926100e 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -84,30 +84,30 @@ default_permissions.write = .*",
         {default_user_tags,[administrator]},
         {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]}],
   []},
- {autocluster,
-  "autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config
-autocluster.classic_config.nodes.peer1 = rabbit@hostname1
-autocluster.classic_config.nodes.peer2 = rabbit@hostname2
-autocluster.node_type = disc",
+ {cluster_formation,
+  "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
+cluster_formation.classic_config.nodes.peer1 = rabbit@hostname1
+cluster_formation.classic_config.nodes.peer2 = rabbit@hostname2
+cluster_formation.node_type = disc",
   [{rabbit,
-       [{autocluster,
+       [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
         {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
- {autocluster_disK,
-  "autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config
-   autocluster.classic_config.nodes.peer1 = rabbit@hostname1
-   autocluster.classic_config.nodes.peer2 = rabbit@hostname2
-   autocluster.node_type = disk",
+ {cluster_formation_disK,
+  "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
+   cluster_formation.classic_config.nodes.peer1 = rabbit@hostname1
+   cluster_formation.classic_config.nodes.peer2 = rabbit@hostname2
+   cluster_formation.node_type = disk",
   [{rabbit,
-       [{autocluster,
+       [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
         {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
- {autocluster_ram_ignored,
-  "autocluster.node_type = ram",[],[]},
+ {cluster_formation_ram_ignored,
+  "cluster_formation.node_type = ram",[],[]},
  {tcp_listen_options,
   "tcp_listen_options.backlog = 128
 tcp_listen_options.nodelay = true
@@ -320,29 +320,29 @@ tcp_listen_options.exit_on_close = false",
   "tcp_listen_options.linger.timeout = 100",
   [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
- {autocluster_dns,
-  "autocluster.peer_discovery_backend = rabbit_peer_discovery_dns
-   autocluster.dns.hostname = 192.168.0.2.xip.io
-   autocluster.node_type = disc",
+ {cluster_formation_dns,
+  "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_dns
+   cluster_formation.dns.hostname = 192.168.0.2.xip.io
+   cluster_formation.node_type = disc",
   [{rabbit,
-       [{autocluster,
+       [{cluster_formation,
             [{peer_discovery_dns,[{hostname,<<"192.168.0.2.xip.io">>}]},
              {peer_discovery_backend,rabbit_peer_discovery_dns},
              {node_type,disc}]}]}],
   []},
- {autocluster_classic,
-  "autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config
-   autocluster.node_type = disc",
+ {cluster_formation_classic,
+  "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
+   cluster_formation.node_type = disc",
   [{rabbit,
-       [{autocluster,
+       [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]}]}],
   []},
- {autocluster_classic_ram,
-  "autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config
-   autocluster.node_type = ram",
+ {cluster_formation_classic_ram,
+  "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
+   cluster_formation.node_type = ram",
   [{rabbit,
-       [{autocluster,
+       [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,ram}]}]}],
   []},
diff --git a/test/crashing_queues_SUITE.erl b/test/crashing_queues_SUITE.erl
index 6e78c1579f..fa0a695173 100644
--- a/test/crashing_queues_SUITE.erl
+++ b/test/crashing_queues_SUITE.erl
@@ -223,7 +223,7 @@ queue_pid(Node, QName) ->
     case State of
         crashed ->
             case rabbit_amqqueue_sup_sup:find_for_vhost(VHost, Node) of
-                {error, {queue_supervisor_not_found, Result}} -> {error, no_sup};
+                {error, {queue_supervisor_not_found, _}} -> {error, no_sup};
                 {ok, SPid} ->
                     case sup_child(Node, SPid) of
                        {ok, _}           -> QPid;   %% restarting
diff --git a/test/sup_delayed_restart_SUITE.erl b/test/sup_delayed_restart_SUITE.erl
index e495f57d0e..0dffe33068 100644
--- a/test/sup_delayed_restart_SUITE.erl
+++ b/test/sup_delayed_restart_SUITE.erl
@@ -81,6 +81,7 @@ exit_child(SupPid) ->
 with_child_pid(SupPid, Fun) ->
     case supervisor2:which_children(SupPid) of
         [{_Id, undefined, worker, [?MODULE]}] -> ok;
+        [{_Id, restarting, worker, [?MODULE]}] -> ok;
         [{_Id,  ChildPid, worker, [?MODULE]}] -> Fun(ChildPid);
         []                                     -> ok
     end.