diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-12-23 17:30:13 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-12-23 17:30:13 +0000 |
| commit | 12901fbbc5656d2140738c98c72272d7b8383c9b (patch) | |
| tree | 9c8db37519856601d37209013367ff3bf6471ae8 /src | |
| parent | 83d32221804d75ce0d6957a0886ae7a451e2a08b (diff) | |
| download | rabbitmq-server-git-12901fbbc5656d2140738c98c72272d7b8383c9b.tar.gz | |
Revert to syncronous vhost recovery since there are concurency limitations
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 3295da6b8d..23ce3c6ef6 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -41,7 +41,6 @@ -include_lib("stdlib/include/qlc.hrl"). -define(QUEUE_MIGRATION_BATCH_SIZE, 100). --define(MSG_STORE_RESTORE_BATCH_SIZE, 100). %%---------------------------------------------------------------------------- %% Messages, and their position in the queue, can be in memory or on @@ -504,13 +503,10 @@ start_msg_store(Refs, StartFunState) when is_map(Refs); Refs == undefined -> [?PERSISTENT_MSG_STORE_SUP, Refs, StartFunState]), %% Start message store for all known vhosts VHosts = rabbit_vhost:list(), - RestoreBatchSize = application:get_env(rabbit, msg_store_restore_batch_size, - ?MSG_STORE_RESTORE_BATCH_SIZE), - in_batches(RestoreBatchSize, - {rabbit_variable_queue, add_vhost_msg_store, []}, - VHosts, - "Recovering batch ~p of ~p vhosts ~n", - "Batch ~p of ~p vhsots recovered ~n"), + lists:foreach(fun(VHost) -> + add_vhost_msg_store(VHost) + end, + VHosts), ok. add_vhost_msg_store(VHost) -> |