diff options
| author | dcorbacho <dparracorbacho@piotal.io> | 2019-10-16 11:55:47 +0100 |
|---|---|---|
| committer | dcorbacho <dparracorbacho@piotal.io> | 2019-10-16 16:22:14 +0100 |
| commit | 50a20c42f36a3c30cd14a8ae81802d8d26ab5979 (patch) | |
| tree | 25b80d3209f08db7f5ea7460db18049f22961163 /src | |
| parent | c8bf2e19e6fd58b35aeb467edcf4b42dbc995d9e (diff) | |
| download | rabbitmq-server-git-50a20c42f36a3c30cd14a8ae81802d8d26ab5979.tar.gz | |
Reserve file handles in quorum queues
[169063174]
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_fifo.erl | 11 | ||||
| -rw-r--r-- | src/rabbit_quorum_queue.erl | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/rabbit_fifo.erl b/src/rabbit_fifo.erl index 062fb7eee1..6982022d61 100644 --- a/src/rabbit_fifo.erl +++ b/src/rabbit_fifo.erl @@ -541,6 +541,7 @@ state_enter(leader, #?MODULE{consumers = Cons, enqueuers = Enqs, waiting_consumers = WaitingConsumers, cfg = #cfg{name = Name, + resource = Resource, become_leader_handler = BLH}, prefix_msgs = {[], []} }) -> @@ -551,7 +552,8 @@ state_enter(leader, #?MODULE{consumers = Cons, Mons = [{monitor, process, P} || P <- Pids], Nots = [{send_msg, P, leader_change, ra_event} || P <- Pids], NodeMons = lists:usort([{monitor, node, node(P)} || P <- Pids]), - Effects = Mons ++ Nots ++ NodeMons, + FHReservation = [{mod_call, rabbit_quorum_queue, file_handle_leader_reservation, [Resource]}], + Effects = Mons ++ Nots ++ NodeMons ++ FHReservation, case BLH of undefined -> Effects; @@ -570,10 +572,11 @@ state_enter(eol, #?MODULE{enqueuers = Enqs, #{}, WaitingConsumers0), AllConsumers = maps:merge(Custs, WaitingConsumers1), [{send_msg, P, eol, ra_event} - || P <- maps:keys(maps:merge(Enqs, AllConsumers))]; -state_enter(_, _) -> + || P <- maps:keys(maps:merge(Enqs, AllConsumers))] ++ + [{mod_call, rabbit_quorum_queue, file_handle_release_reservation, []}]; +state_enter(_, #?MODULE{cfg = #cfg{resource = Resource} }) -> %% catch all as not handling all states - []. + [{mod_call, rabbit_quorum_queue, file_handle_other_reservation, []}]. -spec tick(non_neg_integer(), state()) -> ra_machine:effects(). diff --git a/src/rabbit_quorum_queue.erl b/src/rabbit_quorum_queue.erl index 4f8c129291..e602cd9f04 100644 --- a/src/rabbit_quorum_queue.erl +++ b/src/rabbit_quorum_queue.erl @@ -40,6 +40,8 @@ -export([shrink_all/1, grow/4]). -export([transfer_leadership/2, get_replicas/1, queue_length/1]). +-export([file_handle_leader_reservation/1, file_handle_other_reservation/0]). +-export([file_handle_release_reservation/0]). %%-include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit.hrl"). @@ -883,6 +885,16 @@ matches_strategy(even, Members) -> is_match(Subj, E) -> nomatch /= re:run(Subj, E). +file_handle_leader_reservation(QName) -> + {ok, Q} = rabbit_amqqueue:lookup(QName), + ClusterSize = length(get_nodes(Q)), + file_handle_cache:set_reservation(2 + ClusterSize). + +file_handle_other_reservation() -> + file_handle_cache:set_reservation(2). + +file_handle_release_reservation() -> + file_handle_cache:release_reserve(). %%---------------------------------------------------------------------------- dlx_mfa(Q) -> |