diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index 538e3c46b5a0..4cc788baa788 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -34,7 +34,7 @@ _APP_ENV = """[ {ssl_listeners, []}, {num_ssl_acceptors, 10}, {ssl_options, []}, - {vm_memory_high_watermark, 0.4}, + {vm_memory_high_watermark, 0.6}, {vm_memory_calculation_strategy, rss}, {disk_free_limit, 50000000}, %% 50MB {backing_queue_module, rabbit_variable_queue}, diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 05136f18a02b..041c2614d870 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -14,7 +14,7 @@ define PROJECT_ENV {ssl_listeners, []}, {num_ssl_acceptors, 10}, {ssl_options, []}, - {vm_memory_high_watermark, 0.4}, + {vm_memory_high_watermark, 0.6}, {vm_memory_calculation_strategy, rss}, {disk_free_limit, 50000000}, %% 50MB {backing_queue_module, rabbit_variable_queue}, diff --git a/deps/rabbit/docs/rabbitmq.conf.example b/deps/rabbit/docs/rabbitmq.conf.example index b08bd86135ef..b48f1b43a525 100644 --- a/deps/rabbit/docs/rabbitmq.conf.example +++ b/deps/rabbit/docs/rabbitmq.conf.example @@ -382,7 +382,7 @@ ## Memory-based Flow Control threshold. ## -# vm_memory_high_watermark.relative = 0.4 +# vm_memory_high_watermark.relative = 0.6 ## Alternatively, we can set a limit (in bytes) of RAM used by the node. ## diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index 2fe114c4a609..e95cbecf40a8 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -1103,7 +1103,7 @@ end}. %% Memory-based Flow Control threshold. %% -%% {vm_memory_high_watermark, 0.4}, +%% {vm_memory_high_watermark, 0.6}, %% Alternatively, we can set a limit (in bytes) of RAM used by the node. %% diff --git a/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl b/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl index 09e782018f53..83fb5c27ef70 100644 --- a/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl +++ b/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl @@ -118,4 +118,4 @@ set_and_verify_vm_memory_high_watermark_absolute(MemLimit0) -> _ -> ct:fail("Expected memory high watermark to be ~tp but it was ~tp", [Interpreted, MemLimit]) end, - vm_memory_monitor:set_vm_memory_high_watermark(0.4). \ No newline at end of file + vm_memory_monitor:set_vm_memory_high_watermark(0.6). diff --git a/deps/rabbitmq_mqtt/test/shared_SUITE.erl b/deps/rabbitmq_mqtt/test/shared_SUITE.erl index 9f5bd81edf14..e265243d9c99 100644 --- a/deps/rabbitmq_mqtt/test/shared_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/shared_SUITE.erl @@ -1417,7 +1417,7 @@ block(Config) -> puback_timeout = publish_qos1_timeout(C, Topic, <<"Still blocked">>, 1000), %% Unblock - rpc(Config, vm_memory_monitor, set_vm_memory_high_watermark, [0.4]), + rpc(Config, vm_memory_monitor, set_vm_memory_high_watermark, [0.6]), ok = expect_publishes(C, Topic, [<<"Not blocked yet">>, <<"Now blocked">>, <<"Still blocked">>]), @@ -1458,7 +1458,7 @@ block_only_publisher(Config) -> ?assertEqual(puback_timeout, publish_qos1_timeout(Con, Topic, <<"from Con 2">>, 500)), ?assertEqual(pong, emqtt:ping(Sub)), - rpc(Config, vm_memory_monitor, set_vm_memory_high_watermark, [0.4]), + rpc(Config, vm_memory_monitor, set_vm_memory_high_watermark, [0.6]), %% Let it unblock timer:sleep(100),