diff options
| -rw-r--r-- | src/rabbit_queue_index.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_vhost.erl | 12 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index d19694403c..07ae20f19e 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -494,8 +494,8 @@ start(DurableQueueNames) -> stop() -> rabbit_recovery_terms:stop(). all_queue_directory_names() -> - QueuesBaseDir = queues_base_dir(), - filelib:wildcard(filename:join([QueuesBaseDir, "*", "queues", "*"])). + filelib:wildcard(filename:join([rabbit_vhost:msg_store_dir_wildcard(), + "queues", "*"])). %%---------------------------------------------------------------------------- %% startup and shutdown @@ -516,9 +516,11 @@ blank_state_dir(Dir) -> fun (_) -> ok end). queue_dir(#resource{ virtual_host = VHost } = QueueName) -> - %% Queue directory is {node_database_dir}/{vhost}/queues/{queue} - filename:join([queues_base_dir(), rabbit_vhost:dir(VHost), - "queues", queue_name_to_dir_name(QueueName)]). + %% Queue directory is + %% {node_database_dir}/msg_stores/vhosts/{vhost}/queues/{queue} + VHostDir = rabbit_vhost:msg_store_dir_path(VHost), + QueueDir = queue_name_to_dir_name(QueueName), + filename:join([VHostDir, "queues", QueueDir]). blank_state_dir_funs(Dir, OnSyncFun, OnSyncMsgFun) -> {ok, MaxJournal} = diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index fc8dee8385..7f57c4320c 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -2713,7 +2713,7 @@ transform_store(Store, TransformFun) -> rabbit_msg_store:transform_dir(rabbit_mnesia:dir(), Store, TransformFun). move_messages_to_vhost_store() -> - rabbit_log:info("Moving messages to per-vhsot message store"), + rabbit_log:info("Moving messages to per-vhost message store"), Queues = list_persistent_queues(), %% Legacy (global) msg_store may require recovery. %% This upgrade step should only be started diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index bbf77f290f..26b8143fec 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -23,7 +23,7 @@ -export([add/1, delete/1, exists/1, list/0, with/2, assert/1, update/2, set_limits/2, limits_of/1]). -export([info/1, info/2, info_all/0, info_all/1, info_all/2, info_all/3]). --export([dir/1, msg_store_dir_path/1]). +-export([dir/1, msg_store_dir_path/1, msg_store_dir_wildcard/0]). -export([purge_messages/1]). -spec add(rabbit_types:vhost()) -> 'ok'. @@ -185,10 +185,16 @@ dir(Vhost) -> rabbit_misc:format("~.36B", [Num]). msg_store_dir_path(VHost) -> - Dir = rabbit_mnesia:dir(), EncodedName = list_to_binary(dir(VHost)), - binary_to_list(filename:join([Dir, "msg_stores", "vhosts", EncodedName])). + rabbit_data_coercion:to_list(filename:join([msg_store_dir_base(), + EncodedName])). + +msg_store_dir_wildcard() -> + rabbit_data_coercion:to_list(filename:join([msg_store_dir_base(), "*"])). +msg_store_dir_base() -> + Dir = rabbit_mnesia:dir(), + filename:join([Dir, "msg_stores", "vhosts"]). %%---------------------------------------------------------------------------- |