Skip to content

Commit 2723dad

Browse files
author
Loïc Hoguin
committed
Reject CQv1 in rabbit.schema and more cleanup
1 parent 4514411 commit 2723dad

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2505,7 +2505,7 @@ end}.
25052505
{translation, "rabbit.classic_queue_default_version",
25062506
fun(Conf) ->
25072507
case cuttlefish:conf_get("classic_queue.default_version", Conf, 2) of
2508-
1 -> 1;
2508+
1 -> cuttlefish:invalid("Classic queues v1 are no longer supported");
25092509
2 -> 2;
25102510
_ -> cuttlefish:unset()
25112511
end

deps/rabbit/test/backing_queue_SUITE.erl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ init_per_group1(backing_queue_tests, Config) ->
123123
"Backing queue module not supported by this test group: ~tp~n",
124124
[Module])}
125125
end;
126-
init_per_group1(backing_queue_v2, Config) ->
127-
ok = rabbit_ct_broker_helpers:rpc(Config, 0,
128-
application, set_env, [rabbit, classic_queue_default_version, 2]),
129-
Config;
130126
init_per_group1(backing_queue_embed_limit_0, Config) ->
131127
ok = rabbit_ct_broker_helpers:rpc(Config, 0,
132128
application, set_env, [rabbit, queue_index_embed_msgs_below, 0]),
@@ -171,11 +167,6 @@ end_per_group1(backing_queue_tests, Config) ->
171167
rabbit_ct_broker_helpers:rpc(Config, 0,
172168
?MODULE, teardown_backing_queue_test_group, [Config]);
173169
end_per_group1(Group, Config)
174-
when Group =:= backing_queue_v2 ->
175-
ok = rabbit_ct_broker_helpers:rpc(Config, 0,
176-
application, unset_env, [rabbit, classic_queue_default_version]),
177-
Config;
178-
end_per_group1(Group, Config)
179170
when Group =:= backing_queue_embed_limit_0
180171
orelse Group =:= backing_queue_embed_limit_1024 ->
181172
ok = rabbit_ct_broker_helpers:rpc(Config, 0,

deps/rabbitmq_mqtt/test/shared_SUITE.erl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,8 @@ init_per_group(Group, Config0) ->
201201
Config1,
202202
[{rmq_nodes_count, Nodes},
203203
{rmq_nodename_suffix, Suffix}]),
204-
Config3 = rabbit_ct_helpers:merge_app_env(
205-
Config2,
206-
{rabbit, [{classic_queue_default_version, 2}]}),
207204
Config = rabbit_ct_helpers:run_steps(
208-
Config3,
205+
Config2,
209206
rabbit_ct_broker_helpers:setup_steps() ++
210207
rabbit_ct_client_helpers:setup_steps()),
211208
util:maybe_skip_v5(Config).

deps/rabbitmq_mqtt/test/v5_SUITE.erl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ init_per_group(Group, Config0) ->
169169
{rmq_nodename_suffix, Suffix}]),
170170
Config2 = rabbit_ct_helpers:merge_app_env(
171171
Config1,
172-
{rabbit, [{classic_queue_default_version, 2},
173-
{quorum_tick_interval, 200}]}),
172+
{rabbit, [{quorum_tick_interval, 200}]}),
174173
Config = rabbit_ct_helpers:run_steps(
175174
Config2,
176175
rabbit_ct_broker_helpers:setup_steps() ++

0 commit comments

Comments
 (0)