summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2019-02-21 00:50:30 +0300
committerMichael Klishin <mklishin@pivotal.io>2019-02-21 00:50:30 +0300
commitcecdc6e90cc4af58ca43f1da4e33e68f04a0f118 (patch)
tree7b8db69cee6a41735072e5986d672e72472d91f0
parent496986d10a27d52718a8b3273e896f98f456d2ad (diff)
parent8f7b78c8b19624d83cc8b8edf287cbb11f83a413 (diff)
downloadrabbitmq-server-git-cecdc6e90cc4af58ca43f1da4e33e68f04a0f118.tar.gz
Merge branch 'master' into quorum-queue-grow-cmd
-rw-r--r--src/rabbit_queue_index.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 61373e49c1..665eea12df 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -1472,14 +1472,18 @@ move_to_per_vhost_stores(#resource{} = QueueName) ->
OldQueueDir = filename:join([queues_base_dir(), "queues",
queue_name_to_dir_name_legacy(QueueName)]),
NewQueueDir = queue_dir(QueueName),
+ rabbit_log_upgrade:info("About to migrate queue directory '~s' to '~s'",
+ [OldQueueDir, NewQueueDir]),
case rabbit_file:is_dir(OldQueueDir) of
true ->
ok = rabbit_file:ensure_dir(NewQueueDir),
ok = rabbit_file:rename(OldQueueDir, NewQueueDir),
ok = ensure_queue_name_stub_file(NewQueueDir, QueueName);
false ->
- rabbit_log:info("Queue index directory not found for queue ~p~n",
- [QueueName])
+ Msg = "Queue index directory '~s' not found for ~s~n",
+ Args = [OldQueueDir, rabbit_misc:rs(QueueName)],
+ rabbit_log_upgrade:error(Msg, Args),
+ rabbit_log:error(Msg, Args)
end,
ok.