root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Rename `variable_queue_default_version` to `classic_queue_default_version`

This commit is contained in:
Luke Bakken 2022-01-24 07:19:22 -08:00 committed by Loïc Hoguin
parent 5da7396bf3
commit c352525e0c
No known key found for this signature in database
GPG Key ID: C69E26E3A9DF618F
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbit/priv/schema/rabbit.schema vendored
View File

@ -2114,14 +2114,14 @@ end}.
%% Backing queue version %% Backing queue version
%% %%
{mapping, "rabbit.variable_queue_default_version", "rabbit.variable_queue_default_version", [ {mapping, "rabbit.classic_queue_default_version", "rabbit.classic_queue_default_version", [
{datatype, integer}, {datatype, integer},
{validators, ["non_zero_positive_integer"]} {validators, ["non_zero_positive_integer"]}
]}. ]}.
{translation, "rabbit.variable_queue_default_version", {translation, "rabbit.classic_queue_default_version",
fun(Conf) -> fun(Conf) ->
case cuttlefish:conf_get("rabbit.variable_queue_default_version", Conf, 1) of case cuttlefish:conf_get("rabbit.classic_queue_default_version", Conf, 1) of
1 -> 1; 1 -> 1;
2 -> 2; 2 -> 2;
_ -> cuttlefish:unset() _ -> cuttlefish:unset()

2
deps/rabbit/src/rabbit_amqqueue_process.erl vendored
View File

@ -489,7 +489,7 @@ init_queue_version(Version0, State = #q {backing_queue = BQ,
%% policy might have been deleted, for example, and we want %% policy might have been deleted, for example, and we want
%% the queue to go back to v1. %% the queue to go back to v1.
Version = case Version0 of Version = case Version0 of
undefined -> rabbit_misc:get_env(rabbit, variable_queue_default_version, 1); undefined -> rabbit_misc:get_env(rabbit, classic_queue_default_version, 1);
_ -> Version0 _ -> Version0
end, end,
BQS1 = BQ:set_queue_version(Version, BQS), BQS1 = BQ:set_queue_version(Version, BQS),

2
deps/rabbit/src/rabbit_variable_queue.erl vendored
View File

@ -624,7 +624,7 @@ process_recovery_terms(Terms) ->
queue_version(Q) -> queue_version(Q) ->
Resolve = fun(_, ArgVal) -> ArgVal end, Resolve = fun(_, ArgVal) -> ArgVal end,
case rabbit_queue_type_util:args_policy_lookup(<<"queue-version">>, Resolve, Q) of case rabbit_queue_type_util:args_policy_lookup(<<"queue-version">>, Resolve, Q) of
undefined -> rabbit_misc:get_env(rabbit, variable_queue_default_version, 1); undefined -> rabbit_misc:get_env(rabbit, classic_queue_default_version, 1);
Vsn when is_integer(Vsn) -> Vsn; Vsn when is_integer(Vsn) -> Vsn;
Vsn -> binary_to_integer(Vsn) Vsn -> binary_to_integer(Vsn)
end. end.

8
deps/rabbit/test/backing_queue_SUITE.erl vendored
View File

@ -127,11 +127,11 @@ init_per_group1(backing_queue_tests, Config) ->
end; end;
init_per_group1(backing_queue_v1, Config) -> init_per_group1(backing_queue_v1, Config) ->
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ok = rabbit_ct_broker_helpers:rpc(Config, 0,
application, set_env, [rabbit, variable_queue_default_version, 1]), application, set_env, [rabbit, classic_queue_default_version, 1]),
Config; Config;
init_per_group1(backing_queue_v2, Config) -> init_per_group1(backing_queue_v2, Config) ->
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ok = rabbit_ct_broker_helpers:rpc(Config, 0,
application, set_env, [rabbit, variable_queue_default_version, 2]), application, set_env, [rabbit, classic_queue_default_version, 2]),
Config; Config;
init_per_group1(backing_queue_embed_limit_0, Config) -> init_per_group1(backing_queue_embed_limit_0, Config) ->
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ok = rabbit_ct_broker_helpers:rpc(Config, 0,
@ -182,7 +182,7 @@ end_per_group1(Group, Config)
when Group =:= backing_queue_v1 when Group =:= backing_queue_v1
orelse Group =:= backing_queue_v2 -> orelse Group =:= backing_queue_v2 ->
ok = rabbit_ct_broker_helpers:rpc(Config, 0, ok = rabbit_ct_broker_helpers:rpc(Config, 0,
application, unset_env, [rabbit, variable_queue_default_version]), application, unset_env, [rabbit, classic_queue_default_version]),
Config; Config;
end_per_group1(Group, Config) end_per_group1(Group, Config)
when Group =:= backing_queue_embed_limit_0 when Group =:= backing_queue_embed_limit_0
@ -549,7 +549,7 @@ bq_queue_index(Config) ->
?MODULE, bq_queue_index1, [Config]). ?MODULE, bq_queue_index1, [Config]).
index_mod() -> index_mod() ->
case application:get_env(rabbit, variable_queue_default_version) of case application:get_env(rabbit, classic_queue_default_version) of
{ok, 1} -> rabbit_queue_index; {ok, 1} -> rabbit_queue_index;
{ok, 2} -> rabbit_classic_queue_index_v2 {ok, 2} -> rabbit_classic_queue_index_v2
end. end.

10
deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets vendored
View File

@ -803,14 +803,14 @@ credential_validator.regexp = ^abc\\d+",
%% Backing queue version %% Backing queue version
%% %%
{variable_queue_default_version_2, {classic_queue_default_version_2,
"rabbit.variable_queue_default_version = 2", "rabbit.classic_queue_default_version = 2",
[{rabbit, [ [{rabbit, [
{variable_queue_default_version, 2} {classic_queue_default_version, 2}
]}], ]}],
[]}, []},
{variable_queue_default_version_invalid, {classic_queue_default_version_invalid,
"rabbit.variable_queue_default_version = 3", "rabbit.classic_queue_default_version = 3",
[], [],
[]} []}
]. ].