root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'nyczol-configurable_gc_threshold'

This commit is contained in:
Michael Klishin 2019-12-20 09:06:14 +03:00
parent 330172ce60 c310047f69
commit 70e817e40b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/amqp_client/Makefile vendored
View File

@ -6,7 +6,8 @@ PROJECT_REGISTERED = amqp_sup
define PROJECT_ENV
[
{prefer_ipv6, false},
{ssl_options, []}
{ssl_options, []},
{gc_threshold, 1000000000}
]
endef

6
deps/amqp_client/src/amqp_channel_sup.erl vendored
View File

@ -47,6 +47,9 @@ start_link(Type, Connection, ConnName, InfraArgs, ChNumber,
%% Internal plumbing
%%---------------------------------------------------------------------------
%% 1GB
-define(DEFAULT_GC_THRESHOLD, 1000000000).
start_writer(_Sup, direct, [ConnPid, Node, User, VHost, Collector, AmqpParams],
ConnName, ChNumber, ChPid) ->
{ok, RabbitCh} =
@ -55,11 +58,12 @@ start_writer(_Sup, direct, [ConnPid, Node, User, VHost, Collector, AmqpParams],
VHost, ?CLIENT_CAPABILITIES, Collector, AmqpParams]),
RabbitCh;
start_writer(Sup, network, [Sock, FrameMax], ConnName, ChNumber, ChPid) ->
GCThreshold = application:get_env(amqp_client, gc_threshold, ?DEFAULT_GC_THRESHOLD),
{ok, Writer} = supervisor2:start_child(
Sup,
{writer, {rabbit_writer, start_link,
[Sock, ChNumber, FrameMax, ?PROTOCOL, ChPid,
{ConnName, ChNumber}]},
{ConnName, ChNumber}, false, GCThreshold]},
transient, ?WORKER_WAIT, worker, [rabbit_writer]}),
Writer.

4
deps/amqp_client/src/amqp_connection_type_sup.erl vendored
View File

@ -54,12 +54,14 @@ start_infrastructure_fun(Sup, Conn, network) ->
fun (Sock, ConnName) ->
{ok, ChMgr} = start_channels_manager(Sup, Conn, ConnName, network),
{ok, AState} = rabbit_command_assembler:init(?PROTOCOL),
{ok, GCThreshold} = application:get_env(amqp_client, gc_threshold),
{ok, Writer} =
supervisor2:start_child(
Sup,
{writer,
{rabbit_writer, start_link,
[Sock, 0, ?FRAME_MIN_SIZE, ?PROTOCOL, Conn, ConnName]},
[Sock, 0, ?FRAME_MIN_SIZE, ?PROTOCOL, Conn, ConnName,
false, GCThreshold]},
transient, ?WORKER_WAIT, worker, [rabbit_writer]}),
{ok, Reader} =
supervisor2:start_child(