Reject CQv1 in rabbit.schema and more cleanup

rabbitmq · Mar 12, 2024 · 2723dad · 2723dad
1 parent 4514411
commit 2723dad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
@@ -2505,7 +2505,7 @@ end}.
 {translation, "rabbit.classic_queue_default_version",
     fun(Conf) ->
         case cuttlefish:conf_get("classic_queue.default_version", Conf, 2) of
-            1 -> 1;
+            1 -> cuttlefish:invalid("Classic queues v1 are no longer supported");
             2 -> 2;
             _ -> cuttlefish:unset()
         end

diff --git a/deps/rabbit/test/backing_queue_SUITE.erl b/deps/rabbit/test/backing_queue_SUITE.erl
@@ -123,10 +123,6 @@ init_per_group1(backing_queue_tests, Config) ->
                "Backing queue module not supported by this test group: ~tp~n",
                [Module])}
     end;
-init_per_group1(backing_queue_v2, Config) ->
-    ok = rabbit_ct_broker_helpers:rpc(Config, 0,
-      application, set_env, [rabbit, classic_queue_default_version, 2]),
-    Config;
 init_per_group1(backing_queue_embed_limit_0, Config) ->
     ok = rabbit_ct_broker_helpers:rpc(Config, 0,
       application, set_env, [rabbit, queue_index_embed_msgs_below, 0]),
@@ -171,11 +167,6 @@ end_per_group1(backing_queue_tests, Config) ->
     rabbit_ct_broker_helpers:rpc(Config, 0,
       ?MODULE, teardown_backing_queue_test_group, [Config]);
 end_per_group1(Group, Config)
-when   Group =:= backing_queue_v2 ->
-    ok = rabbit_ct_broker_helpers:rpc(Config, 0,
-      application, unset_env, [rabbit, classic_queue_default_version]),
-    Config;
-end_per_group1(Group, Config)
 when   Group =:= backing_queue_embed_limit_0
 orelse Group =:= backing_queue_embed_limit_1024 ->
     ok = rabbit_ct_broker_helpers:rpc(Config, 0,

diff --git a/deps/rabbitmq_mqtt/test/shared_SUITE.erl b/deps/rabbitmq_mqtt/test/shared_SUITE.erl
@@ -201,11 +201,8 @@ init_per_group(Group, Config0) ->
                 Config1,
                 [{rmq_nodes_count, Nodes},
                  {rmq_nodename_suffix, Suffix}]),
-    Config3 = rabbit_ct_helpers:merge_app_env(
-                Config2,
-                {rabbit, [{classic_queue_default_version, 2}]}),
     Config = rabbit_ct_helpers:run_steps(
-               Config3,
+               Config2,
                rabbit_ct_broker_helpers:setup_steps() ++
                rabbit_ct_client_helpers:setup_steps()),
     util:maybe_skip_v5(Config).

diff --git a/deps/rabbitmq_mqtt/test/v5_SUITE.erl b/deps/rabbitmq_mqtt/test/v5_SUITE.erl
@@ -169,8 +169,7 @@ init_per_group(Group, Config0) ->
                  {rmq_nodename_suffix, Suffix}]),
     Config2 = rabbit_ct_helpers:merge_app_env(
                 Config1,
-                {rabbit, [{classic_queue_default_version, 2},
-                          {quorum_tick_interval, 200}]}),
+                {rabbit, [{quorum_tick_interval, 200}]}),
     Config = rabbit_ct_helpers:run_steps(
                Config2,
                rabbit_ct_broker_helpers:setup_steps() ++