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

See #4980. Give *.absolute precedence over *.relative configuration

This commit is contained in:
Simon Unge 2022-11-28 16:32:00 -08:00
parent 2767feb031
commit 9af4567342
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/rabbit/priv/schema/rabbit.schema vendored
View File

@ -955,7 +955,12 @@ fun(Conf) ->
case {Absolute, Relative} of
{undefined, undefined} -> cuttlefish:invalid("No vm watermark defined");
{_, undefined} -> {absolute, Absolute};
_ -> Relative
{undefined, _} -> Relative;
_ ->
cuttlefish:warn("Both vm_memory_high_watermark.absolute and "
"vm_memory_high_watermark.relative are configured. "
"vm_memory_high_watermark.absolute has precedence"),
{absolute, Absolute}
end
end}.
@ -1023,7 +1028,12 @@ fun(Conf) ->
case {Absolute, Relative} of
{undefined, undefined} -> cuttlefish:invalid("No disk limit defined");
{_, undefined} -> Absolute;
_ -> {mem_relative, Relative}
{undefined, _} -> {mem_relative, Relative};
_ ->
cuttlefish:warn("Both disk_free_limit.absolute and "
"disk_free_limit.relative are configured. "
"disk_free_limit.absolute has precedence"),
Absolute
end
end}.

24
deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets vendored
View File

@ -100,6 +100,25 @@ ssl_options.fail_if_no_peer_cert = true",
{socket_writer_gc_threshold_off,
"socket_writer.gc_threshold = off", [{rabbit, [{writer_gc_threshold, undefined}]}],[]},
{disk_free_limit_absolute_priority,
"disk_free_limit.relative = 1.0
disk_free_limit.absolute = 50000",
[{rabbit, [{disk_free_limit, 50000}]}],[]},
{disk_free_limit_absolute_priority_regardless_of_order,
"disk_free_limit.absolute = 50000
disk_free_limit.relative = 1.0",
[{rabbit, [{disk_free_limit, 50000}]}],[]},
{disk_free_limit_only_relative,
"disk_free_limit.relative = 1.0",
[{rabbit, [{disk_free_limit, {mem_relative, 1.0}}]}],[]},
{disk_free_limit_only_absolute,
"disk_free_limit.absolute = 50000",
[{rabbit, [{disk_free_limit, 50000}]}],[]},
{default_vhost_limits_with_two_limits,
"
default_limits.vhosts.a.pattern = .*
@ -207,6 +226,11 @@ tcp_listen_options.exit_on_close = false",
"vm_memory_high_watermark.absolute = 1024MB",
[{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]}],
[]},
{vm_memory_watermark_absolute_priority,
"vm_memory_high_watermark.absolute = 1073741824
vm_memory_high_watermark.relative = 0.4",
[{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}],
[]},
{vm_memory_watermark_paging_ratio,
"vm_memory_high_watermark_paging_ratio = 0.75
vm_memory_high_watermark.relative = 0.4",