Skip to content

v4.0.x: Backport #13055 (né #13046) by @JimmyWang6 #13056

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 7 commits into from
Jan 12, 2025
Merged

v4.0.x: Backport #13055 (né #13046) by @JimmyWang6 #13056

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c746147
Fix MoreCreditAfter could larger than InitialCredit
JimmyWang6 Jan 8, 2025
5346fcf
Fix typo
Jan 10, 2025
e56a082
Change to throw an error when credit_flow_default_credit invalid
Jan 11, 2025
3b9520b
Change to throw an error when credit_flow_default_credit invalid
Jan 11, 2025
29e8fa4
Fix typo
Jan 11, 2025
a360961
Fix typo
Jan 11, 2025
f302dab
Finish off #13046
michaelklishin Jan 12, 2025
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
20 changes: 18 additions & 2 deletions deps/rabbit/src/rabbit.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,10 +1751,26 @@ persist_static_configuration() ->
[classic_queue_index_v2_segment_entry_count,
classic_queue_store_v2_max_cache_size,
classic_queue_store_v2_check_crc32,
incoming_message_interceptors,
credit_flow_default_credit
incoming_message_interceptors
]),

%% Disallow the following two cases:
%% 1. Negative values
%% 2. MoreCreditAfter greater than InitialCredit
CreditFlowDefaultCredit = case application:get_env(?MODULE, credit_flow_default_credit) of
{ok, {InitialCredit, MoreCreditAfter}}
when is_integer(InitialCredit) andalso
is_integer(MoreCreditAfter) andalso
InitialCredit > 0 andalso
MoreCreditAfter > 0 andalso
MoreCreditAfter < InitialCredit ->
{InitialCredit, MoreCreditAfter};
Other ->
rabbit_log:error("Refusing to boot due to an invalid value of 'rabbit.credit_flow_default_credit'"),
throw({error, {invalid_credit_flow_default_credit_value, Other}})
end,
ok = persistent_term:put(credit_flow_default_credit, CreditFlowDefaultCredit),

%% Disallow 0 as it means unlimited:
%% "If this field is zero or unset, there is no maximum
%% size imposed by the link endpoint." [AMQP 1.0 §2.7.3]
Expand Down
Loading