diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-11 20:32:23 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-11 21:22:09 +0300 |
| commit | 1643c344b872ee43317928f6e579adb568cb45db (patch) | |
| tree | 82c8bd5349ab735f0a3d4134681ffacdce3fdf8c | |
| parent | eea4fc3fd423d2b5c624ecf440e7bfcbed6ff044 (diff) | |
| download | rabbitmq-server-git-1643c344b872ee43317928f6e579adb568cb45db.tar.gz | |
Renames
| -rw-r--r-- | src/rabbit_msg_store_vhost_sup.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_msg_store_vhost_sup.erl b/src/rabbit_msg_store_vhost_sup.erl index 06034819b4..601b8746e7 100644 --- a/src/rabbit_msg_store_vhost_sup.erl +++ b/src/rabbit_msg_store_vhost_sup.erl @@ -48,10 +48,10 @@ delete_vhost(Name, VHost) -> ok. client_init(Name, Ref, MsgOnDiskFun, CloseFDsFun, VHost) -> - VHostPid = maybe_start_vhost(Name, VHost), + VHostPid = maybe_start_store_for_vhost(Name, VHost), rabbit_msg_store:client_init(VHostPid, Ref, MsgOnDiskFun, CloseFDsFun). -maybe_start_vhost(Name, VHost) -> +maybe_start_store_for_vhost(Name, VHost) -> case add_vhost(Name, VHost) of {ok, Pid} -> Pid; {error, {already_started, Pid}} -> Pid; diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 41ee6cde4c..8995154886 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -2743,8 +2743,8 @@ move_messages_to_vhost_store() -> ok = rabbit_sup:stop_child(NewStoreSup). migrate_queue(Queue, OldStore, NewStoreSup) -> - OldStoreClient = get_old_client(OldStore), - NewStoreClient = get_new_store_client(Queue, NewStoreSup), + OldStoreClient = get_global_store_client(OldStore), + NewStoreClient = get_per_vhost_store_client(Queue, NewStoreSup), #amqqueue{name = QueueName} = Queue, rabbit_queue_index:move_to_per_vhost_stores(QueueName), %% WARNING: During scan_queue_segments queue index state is being recovered @@ -2775,15 +2775,15 @@ migrate_message(MsgId, OldC, NewC) -> _ -> OldC end. -get_new_store_client(#amqqueue{name = #resource{virtual_host = VHost}}, - NewStoreSup) -> +get_per_vhost_store_client(#amqqueue{name = #resource{virtual_host = VHost}}, + NewStoreSup) -> rabbit_msg_store_vhost_sup:client_init(NewStoreSup, rabbit_guid:gen(), fun(_,_) -> ok end, fun() -> ok end, VHost). -get_old_client(OldStore) -> +get_global_store_client(OldStore) -> rabbit_msg_store:client_init(OldStore, rabbit_guid:gen(), fun(_,_) -> ok end, |