summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-08-23 15:24:30 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-08-23 15:24:30 +0100
commitf588b129a945c940a716c803d784bde29b6ff30e (patch)
tree6d2bf6fdb040514f476b0d6fc5e6e1349812347d
parente1abffe25272a1a712d289795b896cae5e5dd636 (diff)
parentc0cd9cd27514165b2c424e10a26bc1c9ae7fd7be (diff)
downloadrabbitmq-server-f588b129a945c940a716c803d784bde29b6ff30e.tar.gz
merge bug23167 into default (Large msg_store mailbox can block queue.declare)
-rw-r--r--src/rabbit_msg_store.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 207ddcb8..6576bfbb 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -362,7 +362,7 @@ set_maximum_since_use(Server, Age) ->
client_init(Server, Ref) ->
{IState, IModule, Dir, GCPid,
FileHandlesEts, FileSummaryEts, DedupCacheEts, CurFileCacheEts} =
- gen_server2:call(Server, {new_client_state, Ref}, infinity),
+ gen_server2:pcall(Server, 7, {new_client_state, Ref}, infinity),
#client_msstate { file_handle_cache = dict:new(),
index_state = IState,
index_module = IModule,
@@ -382,7 +382,7 @@ client_delete_and_terminate(CState, Server, Ref) ->
ok = gen_server2:call(Server, {delete_client, Ref}, infinity).
successfully_recovered_state(Server) ->
- gen_server2:call(Server, successfully_recovered_state, infinity).
+ gen_server2:pcall(Server, 7, successfully_recovered_state, infinity).
%%----------------------------------------------------------------------------
%% Client-side-only helpers