Merge pull request #5430 from rabbitmq/mergify/bp/v3.11.x/pr-5237

Remove pre-maintenance_mode_status compatibility code (backport #5237)

8 files changed, 24 insertions, 94 deletions

diff --git a/deps/rabbit/src/rabbit_maintenance.erl b/deps/rabbit/src/rabbit_maintenance.erl
index 09aaa7f9f7..2c004bd2ab 100644
--- a/deps/rabbit/src/rabbit_maintenance.erl
+++ b/deps/rabbit/src/rabbit_maintenance.erl
@@ -34,7 +34,6 @@
 ]).
 
 -define(TABLE, rabbit_node_maintenance_states).
--define(FEATURE_FLAG, maintenance_mode_status).
 -define(DEFAULT_STATUS,  regular).
 -define(DRAINING_STATUS, draining).
 
@@ -55,26 +54,18 @@
         {requires,    networking}]}).
 
 boot() ->
-    case rabbit_feature_flags:is_enabled(?FEATURE_FLAG, non_blocking) of
-        true ->
-            TableName = status_table_name(),
-            rabbit_log:info(
-                "Creating table ~s for feature flag `~s`",
-                [TableName, ?FEATURE_FLAG]),
-            try
-                _ = rabbit_table:create(
-                    TableName,
-                    status_table_definition())
-            catch throw:Reason  ->
-                rabbit_log:error(
-                    "Failed to create maintenance status table: ~p",
-                    [Reason])
-            end;
-        false ->
-            ok;
-        state_changing ->
-            %% feature flag migration will do the job for us
-            ok
+    TableName = status_table_name(),
+    rabbit_log:info(
+      "Creating table ~s for maintenance mode status",
+      [TableName]),
+    try
+        _ = rabbit_table:create(
+              TableName,
+              status_table_definition())
+    catch throw:Reason  ->
+              rabbit_log:error(
+                "Failed to create maintenance status table: ~p",
+                [Reason])
     end.
 
 %%
@@ -94,19 +85,10 @@ status_table_definition() ->
 
 -spec is_enabled() -> boolean().
 is_enabled() ->
-    rabbit_feature_flags:is_enabled(?FEATURE_FLAG).
+    true.
 
 -spec drain() -> ok.
 drain() ->
-    case is_enabled() of
-        true  -> do_drain();
-        false ->
-            rabbit_log:error("Feature flag '~s' is not enabled, cannot put this node under maintenance", [?FEATURE_FLAG]),
-            {error, rabbit_misc:format("Feature flag '~s' is not enabled, cannot put this node under maintenance", [?FEATURE_FLAG])}
-    end.
-
--spec do_drain() -> ok.
-do_drain() ->
     rabbit_log:warning("This node is being put into maintenance (drain) mode"),
     mark_as_being_drained(),
     rabbit_log:info("Marked this node as undergoing maintenance"),
@@ -135,15 +117,6 @@ do_drain() ->
 
 -spec revive() -> ok.
 revive() ->
-    case is_enabled() of
-        true  -> do_revive();
-        false ->
-            rabbit_log:error("Feature flag '~s' is not enabled, cannot put this node out of maintenance", [?FEATURE_FLAG]),
-            {error, rabbit_misc:format("Feature flag '~s' is not enabled, cannot put this node out of maintenance", [?FEATURE_FLAG])}
-    end.
-
--spec do_revive() -> ok.
-do_revive() ->
     rabbit_log:info("This node is being revived from maintenance (drain) mode"),
     revive_local_quorum_queue_replicas(),
     rabbit_log:info("Resumed all listeners and will accept client connections again"),
diff --git a/deps/rabbit/test/maintenance_mode_SUITE.erl b/deps/rabbit/test/maintenance_mode_SUITE.erl
index 728ee3e6f1..b57307a594 100644
--- a/deps/rabbit/test/maintenance_mode_SUITE.erl
+++ b/deps/rabbit/test/maintenance_mode_SUITE.erl
@@ -74,19 +74,11 @@ init_per_testcase(quorum_queue_leadership_transfer = Testcase, Config) ->
                 Config1,
                 rabbit_ct_broker_helpers:setup_steps() ++
                 rabbit_ct_client_helpers:setup_steps()),
-    MaintenanceModeFFEnabled = rabbit_ct_broker_helpers:enable_feature_flag(
-                                Config2, maintenance_mode_status),
     QuorumQueueFFEnabled = rabbit_ct_broker_helpers:enable_feature_flag(
                                 Config2, quorum_queue),
-    case MaintenanceModeFFEnabled of
+    case QuorumQueueFFEnabled of
         ok ->
-            case QuorumQueueFFEnabled of
-                ok ->
-                    Config2;
-                Skip ->
-                    end_per_testcase(Testcase, Config2),
-                    Skip
-            end;
+            Config2;
         Skip ->
             end_per_testcase(Testcase, Config2),
             Skip
@@ -100,21 +92,11 @@ init_per_testcase(Testcase, Config) ->
         {rmq_nodename_suffix, Testcase},
         {tcp_ports_base, {skip_n_nodes, TestNumber * ClusterSize}}
       ]),
-    Config2 = rabbit_ct_helpers:run_steps(
-                Config1,
-                rabbit_ct_broker_helpers:setup_steps() ++
-                rabbit_ct_client_helpers:setup_steps() ++
-                [fun rabbit_ct_broker_helpers:set_ha_policy_all/1]),
-    MaintenanceModeFFEnabled = rabbit_ct_broker_helpers:enable_feature_flag(
-                                Config2,
-                                maintenance_mode_status),
-    case MaintenanceModeFFEnabled of
-        ok ->
-            Config2;
-        Skip ->
-            end_per_testcase(Testcase, Config2),
-            Skip
-    end.
+    rabbit_ct_helpers:run_steps(
+      Config1,
+      rabbit_ct_broker_helpers:setup_steps() ++
+      rabbit_ct_client_helpers:setup_steps() ++
+      [fun rabbit_ct_broker_helpers:set_ha_policy_all/1]).
 
 end_per_testcase(Testcase, Config) ->
     Config1 = rabbit_ct_helpers:run_steps(Config,
diff --git a/deps/rabbit/test/queue_master_location_SUITE.erl b/deps/rabbit/test/queue_master_location_SUITE.erl
index e79d48d568..cc985be227 100644
--- a/deps/rabbit/test/queue_master_location_SUITE.erl
+++ b/deps/rabbit/test/queue_master_location_SUITE.erl
@@ -109,26 +109,10 @@ init_per_testcase(Testcase, Config) ->
         {rmq_nodename_suffix, Testcase},
         {tcp_ports_base, {skip_n_nodes, TestNumber * ClusterSize}}
       ]),
-    Config2 = rabbit_ct_helpers:run_steps(
-                Config1,
-                rabbit_ct_broker_helpers:setup_steps() ++
-                rabbit_ct_client_helpers:setup_steps()),
-    Group = proplists:get_value(name, ?config(tc_group_properties, Config)),
-    FFEnabled = case Group of
-                    maintenance_mode ->
-                        rabbit_ct_broker_helpers:enable_feature_flag(
-                          Config2,
-                          maintenance_mode_status);
-                    _ ->
-                        ok
-                end,
-    case FFEnabled of
-        ok ->
-            Config2;
-        Skip ->
-            end_per_testcase(Testcase, Config2),
-            Skip
-    end.
+    rabbit_ct_helpers:run_steps(
+      Config1,
+      rabbit_ct_broker_helpers:setup_steps() ++
+      rabbit_ct_client_helpers:setup_steps()).
 
 end_per_testcase(Testcase, Config) ->
     Config1 = rabbit_ct_helpers:run_steps(Config,
diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl
index 3121ad1ff5..5fcbe320e6 100644
--- a/deps/rabbit/test/quorum_queue_SUITE.erl
+++ b/deps/rabbit/test/quorum_queue_SUITE.erl
@@ -223,8 +223,6 @@ init_per_group(Group, Config) ->
                             %% tests.
                             timer:sleep(ClusterSize * 1000),
                             ok = rabbit_ct_broker_helpers:enable_feature_flag(
-                                   Config2, maintenance_mode_status),
-                            ok = rabbit_ct_broker_helpers:enable_feature_flag(
                                    Config2, virtual_host_metadata),
                             Config2;
                         Skip ->
diff --git a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
index 7276b377ee..7ba833d481 100644
--- a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
+++ b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
@@ -188,8 +188,6 @@ init_per_group1(Group, Config) ->
                     ok = rabbit_ct_broker_helpers:rpc(
                            Config2, 0, application, set_env,
                            [rabbit, channel_tick_interval, 100]),
-                    ok = rabbit_ct_broker_helpers:enable_feature_flag(
-                           Config2, maintenance_mode_status),
                     Config2;
                 {skip, _} = Skip ->
                     end_per_group(Group, Config2),
diff --git a/deps/rabbitmq_cli/test/upgrade/drain_command_test.exs b/deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
index 90e6c7aeb5..3533f7feff 100644
--- a/deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
+++ b/deps/rabbitmq_cli/test/upgrade/drain_command_test.exs
@@ -23,8 +23,6 @@ defmodule DrainCommandTest do
   end
 
   setup context do
-    enable_feature_flag(:maintenance_mode_status)
-
     {:ok, opts: %{
         node: get_rabbit_hostname(),
         timeout: context[:test_timeout] || 5000
diff --git a/deps/rabbitmq_cli/test/upgrade/revive_command_test.exs b/deps/rabbitmq_cli/test/upgrade/revive_command_test.exs
index ba39c90469..6d43d59b83 100644
--- a/deps/rabbitmq_cli/test/upgrade/revive_command_test.exs
+++ b/deps/rabbitmq_cli/test/upgrade/revive_command_test.exs
@@ -23,8 +23,6 @@ defmodule ReviveCommandTest do
   end
 
   setup context do
-    enable_feature_flag(:maintenance_mode_status)
-
     {:ok, opts: %{
         node: get_rabbit_hostname(),
         timeout: context[:test_timeout] || 5000
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
index 5a1e768a95..78abc4fb48 100644
--- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
+++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
@@ -83,7 +83,6 @@ init_per_group(Group, Config)
                                                      [{forced_feature_flags_on_init,
                                                        [classic_mirrored_queue_version,
                                                         implicit_default_bindings,
-                                                        maintenance_mode_status,
                                                         virtual_host_metadata,
                                                         quorum_queue,
                                                         stream_queue]}]})