Skip to content

Merge rabbitmq-server-1535 to master #1537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 3, 2018
Merged

Merge rabbitmq-server-1535 to master #1537

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
118b448
Test RABBITMQ_var vs var behaviour when using rabbitmq-env.conf
gerhard Feb 26, 2018
512a57b
Fix default maximum number of Erlang processes
gerhard Feb 26, 2018
631f822
Merge pull request #1528 from rabbitmq/configurable-max-procs-max-atoms
michaelklishin Feb 26, 2018
6e9b3d1
Correct generated randomized startup delay range key
michaelklishin Feb 27, 2018
668425e
Log a message when we fall back to randomized startup delay
michaelklishin Feb 27, 2018
884003d
Merge pull request #1533 from rabbitmq/rabbitmq-server-1531
michaelklishin Feb 27, 2018
7eab12c
Update erlang.mk
dumbbell Mar 2, 2018
b47a772
Handle bump_reduce_memory_use info message
lukebakken Mar 2, 2018
9b018c2
Merge remote-tracking branch 'origin/rabbitmq-server-1535' into rabbi…
lukebakken Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/rabbit_priority_queue.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ handle_pre_hibernate(State = #state{bq = BQ}) ->
handle_pre_hibernate(State = #passthrough{bq = BQ, bqs = BQS}) ->
?passthrough1(handle_pre_hibernate(BQS)).

handle_info(Msg, State = #state{bq = BQ}) ->
foreach1(fun (_P, BQSN) -> BQ:handle_info(Msg, BQSN) end, State);
handle_info(Msg, State = #passthrough{bq = BQ, bqs = BQS}) ->
?passthrough1(handle_info(Msg, BQS)).

Expand All @@ -408,6 +410,7 @@ msg_rates(#state{bq = BQ, bqss = BQSs}) ->
end, {0.0, 0.0}, BQSs);
msg_rates(#passthrough{bq = BQ, bqs = BQS}) ->
BQ:msg_rates(BQS).

info(backing_queue_status, #state{bq = BQ, bqss = BQSs}) ->
fold0(fun (P, BQSN, Acc) ->
combine_status(P, BQ:info(backing_queue_status, BQSN), Acc)
Expand Down Expand Up @@ -481,9 +484,9 @@ add0(Fun, BQSs) -> fold0(fun (P, BQSN, Acc) -> Acc + Fun(P, BQSN) end, 0, BQSs).
%% Apply for all states
foreach1(Fun, State = #state{bqss = BQSs}) ->
a(State#state{bqss = foreach1(Fun, BQSs, [])}).
foreach1(Fun, [{P, BQSN} | Rest], BQSAcc) ->
BQSN1 = Fun(P, BQSN),
foreach1(Fun, Rest, [{P, BQSN1} | BQSAcc]);
foreach1(Fun, [{Priority, BQSN} | Rest], BQSAcc) ->
BQSN1 = Fun(Priority, BQSN),
foreach1(Fun, Rest, [{Priority, BQSN1} | BQSAcc]);
foreach1(_Fun, [], BQSAcc) ->
lists:reverse(BQSAcc).

Expand Down