Skip to content

Commit ebf055d

Browse files
committed
Allow configuring classic queue data dir in Cuttlefish config
Same as the parent commit but for classic queue data directories.
1 parent ed05953 commit ebf055d

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2620,6 +2620,20 @@ end}.
26202620
{datatype, {enum, [true, false]}}
26212621
]}.
26222622

2623+
%% Classic queue data directory
2624+
{mapping, "classic_queue.data_dir", "rabbit.classic_queue_data_dir", [
2625+
{datatype, string}
2626+
]}.
2627+
2628+
{translation, "rabbit.classic_queue_data_dir",
2629+
fun(Conf) ->
2630+
case cuttlefish:conf_get("classic_queue.data_dir", Conf, undefined) of
2631+
undefined -> cuttlefish:unset();
2632+
Val -> Val
2633+
end
2634+
end
2635+
}.
2636+
26232637
%%
26242638
%% Backing queue version
26252639
%%

deps/rabbit/src/rabbit_vhost.erl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,13 @@ msg_store_dir_wildcard() ->
679679
rabbit_data_coercion:to_list(filename:join([msg_store_dir_base(), "*"])).
680680

681681
msg_store_dir_base() ->
682-
Dir = rabbit:data_dir(),
683-
filename:join([Dir, "msg_stores", "vhosts"]).
682+
case application:get_env(rabbit, classic_queue_data_dir) of
683+
{ok, Dir} ->
684+
Dir;
685+
undefined ->
686+
Dir = rabbit:data_dir(),
687+
filename:join([Dir, "msg_stores", "vhosts"])
688+
end.
684689

685690
config_file_path(VHost) ->
686691
VHostDir = msg_store_dir_path(VHost),

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,16 @@ credential_validator.regexp = ^abc\\d+",
11111111
[],
11121112
[]},
11131113

1114+
%%
1115+
%% Classic queue data dir
1116+
%%
1117+
{classic_queue_data_dir,
1118+
"classic_queue.data_dir = /data/rabbitmq/classic",
1119+
[{rabbit, [
1120+
{classic_queue_data_dir, "/data/rabbitmq/classic"}
1121+
]}],
1122+
[]},
1123+
11141124
%%
11151125
%% Quorum queue
11161126
%%

0 commit comments

Comments
 (0)