Merge pull request #2315 from rabbitmq/use-new-inet_tcp_proxy_dist

Use new `inet_tcp_proxy_dist`

4 files changed, 17 insertions, 22 deletions

diff --git a/src/rabbit_feature_flags.erl b/src/rabbit_feature_flags.erl
index cf2715a724..e0fb3a2fe1 100644
--- a/src/rabbit_feature_flags.erl
+++ b/src/rabbit_feature_flags.erl
@@ -1695,7 +1695,6 @@ mark_as_enabled_remotely(Nodes, FeatureName, IsEnabled, Timeout) ->
               "nodes", [FeatureName, IsEnabled]),
             ok;
         _ ->
-            T1 = erlang:timestamp(),
             rabbit_log_feature_flags:error(
               "Feature flags: failed to mark feature flag `~s` as enabled=~p "
               "on the following nodes:", [FeatureName, IsEnabled]),
@@ -1704,12 +1703,17 @@ mark_as_enabled_remotely(Nodes, FeatureName, IsEnabled, Timeout) ->
                [Node, Ret])
              || {Node, Ret} <- Rets,
                 Ret =/= ok],
-            NewTimeout = Timeout - (timer:now_diff(T1, T0) div 1000),
+            Sleep = 1000,
+            T1 = erlang:timestamp(),
+            Duration = timer:now_diff(T1, T0),
+            NewTimeout = (Timeout * 1000 - Duration) div 1000 - Sleep,
             if
                 NewTimeout > 0 ->
                     rabbit_log_feature_flags:debug(
                       "Feature flags:   retrying with a timeout of ~b "
-                      "milliseconds", [NewTimeout]),
+                      "ms after sleeping for ~b ms",
+                      [NewTimeout, Sleep]),
+                    timer:sleep(Sleep),
                     mark_as_enabled_remotely(FailedNodes,
                                              FeatureName,
                                              IsEnabled,
diff --git a/test/feature_flags_SUITE.erl b/test/feature_flags_SUITE.erl
index 7cfda838ed..9d6df4a3eb 100644
--- a/test/feature_flags_SUITE.erl
+++ b/test/feature_flags_SUITE.erl
@@ -105,8 +105,8 @@ groups() ->
 init_per_suite(Config) ->
     rabbit_ct_helpers:log_environment(),
     rabbit_ct_helpers:run_setup_steps(Config, [
-        fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1
-      ]).
+      fun rabbit_ct_broker_helpers:configure_dist_proxy/1
+    ]).
 
 end_per_suite(Config) ->
     rabbit_ct_helpers:run_teardown_steps(Config).
@@ -118,8 +118,7 @@ init_per_group(enabling_on_single_node, Config) ->
 init_per_group(enabling_in_cluster, Config) ->
     rabbit_ct_helpers:set_config(
       Config,
-      [{rmq_nodes_count, 5},
-       {rmq_nodes_clustered, false}]);
+      [{rmq_nodes_count, 5}]);
 init_per_group(clustering, Config) ->
     Config1 = rabbit_ct_helpers:set_config(
                 Config,
@@ -225,9 +224,7 @@ init_per_testcase(Testcase, Config) ->
             Config3 = rabbit_ct_helpers:run_steps(
                         Config2,
                         rabbit_ct_broker_helpers:setup_steps() ++
-                        rabbit_ct_client_helpers:setup_steps() ++
-                        [fun rabbit_ct_broker_helpers:enable_dist_proxy/1,
-                         fun rabbit_ct_broker_helpers:cluster_nodes/1]),
+                        rabbit_ct_client_helpers:setup_steps()),
             case Config3 of
                 {skip, _} ->
                     Config3;
diff --git a/test/per_vhost_connection_limit_partitions_SUITE.erl b/test/per_vhost_connection_limit_partitions_SUITE.erl
index bd0eb08302..7ec4cc92e4 100644
--- a/test/per_vhost_connection_limit_partitions_SUITE.erl
+++ b/test/per_vhost_connection_limit_partitions_SUITE.erl
@@ -54,8 +54,8 @@ suite() ->
 init_per_suite(Config) ->
     rabbit_ct_helpers:log_environment(),
     rabbit_ct_helpers:run_setup_steps(Config, [
-                                               fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1
-                                              ]).
+      fun rabbit_ct_broker_helpers:configure_dist_proxy/1
+    ]).
 
 end_per_suite(Config) ->
     rabbit_ct_helpers:run_teardown_steps(Config).
@@ -68,15 +68,11 @@ init_per_multinode_group(_Group, Config, NodeCount) ->
     Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
     Config1 = rabbit_ct_helpers:set_config(Config, [
                                                     {rmq_nodes_count, NodeCount},
-                                                    {rmq_nodename_suffix, Suffix},
-                                                    {rmq_nodes_clustered, false}
+                                                    {rmq_nodename_suffix, Suffix}
       ]),
     rabbit_ct_helpers:run_steps(Config1,
       rabbit_ct_broker_helpers:setup_steps() ++
-      rabbit_ct_client_helpers:setup_steps() ++ [
-        fun rabbit_ct_broker_helpers:enable_dist_proxy/1,
-        fun rabbit_ct_broker_helpers:cluster_nodes/1
-      ]).
+      rabbit_ct_client_helpers:setup_steps()).
 
 end_per_group(_Group, Config) ->
     rabbit_ct_helpers:run_steps(Config,
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl
index 3a246445e5..4a4738d9fa 100644
--- a/test/quorum_queue_SUITE.erl
+++ b/test/quorum_queue_SUITE.erl
@@ -155,7 +155,7 @@ init_per_suite(Config0) ->
                Config0, {rabbit, [{quorum_tick_interval, 1000}]}),
     rabbit_ct_helpers:run_setup_steps(
       Config,
-      [fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1]).
+      [fun rabbit_ct_broker_helpers:configure_dist_proxy/1]).
 
 end_per_suite(Config) ->
     rabbit_ct_helpers:run_teardown_steps(Config).
@@ -233,9 +233,7 @@ init_per_testcase(Testcase, Config) when Testcase == reconnect_consumer_and_publ
     Ret = rabbit_ct_helpers:run_steps(
             Config2,
             rabbit_ct_broker_helpers:setup_steps() ++
-            rabbit_ct_client_helpers:setup_steps() ++
-            [fun rabbit_ct_broker_helpers:enable_dist_proxy/1,
-             fun rabbit_ct_broker_helpers:cluster_nodes/1]),
+            rabbit_ct_client_helpers:setup_steps()),
     case Ret of
         {skip, _} ->
             Ret;