summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2019-02-19 17:33:03 +0300
committerMichael Klishin <michael@clojurewerkz.org>2019-02-19 17:33:03 +0300
commit8f7b78c8b19624d83cc8b8edf287cbb11f83a413 (patch)
tree6ff7be5cd7be1b6b39abb3d42763c0db2c2a5152
parentc5df441e8130d33683082e165b3ff993f1580ee0 (diff)
downloadrabbitmq-server-git-8f7b78c8b19624d83cc8b8edf287cbb11f83a413.tar.gz
Improve queue index migration
A failure to locate source directory should be logged as an error into both upgrade and regular log for extra visibility. See https://groups.google.com/forum/#!topic/rabbitmq-users/toq2dpocm0k for background.
-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.