diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index c91cd890ff2c..538e3c46b5a0 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -35,9 +35,7 @@ _APP_ENV = """[ {num_ssl_acceptors, 10}, {ssl_options, []}, {vm_memory_high_watermark, 0.4}, - {vm_memory_high_watermark_paging_ratio, 0.5}, {vm_memory_calculation_strategy, rss}, - {memory_monitor_interval, 2500}, {disk_free_limit, 50000000}, %% 50MB {backing_queue_module, rabbit_variable_queue}, %% 0 ("no limit") would make a better default, but that @@ -84,10 +82,7 @@ _APP_ENV = """[ {linger, {true, 0}}, {exit_on_close, false} ]}, - {halt_on_upgrade_failure, true}, {ssl_apps, [asn1, crypto, public_key, ssl]}, - %% classic queue storage implementation version - {classic_queue_default_version, 2}, %% see rabbitmq-server#227 and related tickets. %% msg_store_credit_disc_bound only takes effect when %% messages are persisted to the message store. If messages @@ -106,10 +101,6 @@ _APP_ENV = """[ %% and rabbitmq-server#667 {channel_operation_timeout, 15000}, - %% see rabbitmq-server#486 - {autocluster, - [{peer_discovery_backend, rabbit_peer_discovery_classic_config}] - }, %% used by rabbit_peer_discovery_classic_config {cluster_nodes, {[], disc}}, diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 35f2e6c3a3a0..05136f18a02b 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -15,9 +15,7 @@ define PROJECT_ENV {num_ssl_acceptors, 10}, {ssl_options, []}, {vm_memory_high_watermark, 0.4}, - {vm_memory_high_watermark_paging_ratio, 0.5}, {vm_memory_calculation_strategy, rss}, - {memory_monitor_interval, 2500}, {disk_free_limit, 50000000}, %% 50MB {backing_queue_module, rabbit_variable_queue}, %% 0 ("no limit") would make a better default, but that @@ -67,10 +65,7 @@ define PROJECT_ENV {linger, {true, 0}}, {exit_on_close, false} ]}, - {halt_on_upgrade_failure, true}, {ssl_apps, [asn1, crypto, public_key, ssl]}, - %% classic queue storage implementation version - {classic_queue_default_version, 2}, %% see rabbitmq-server#227 and related tickets. %% msg_store_credit_disc_bound only takes effect when %% messages are persisted to the message store. If messages @@ -92,10 +87,6 @@ define PROJECT_ENV %% 30 minutes {consumer_timeout, 1800000}, - %% see rabbitmq-server#486 - {autocluster, - [{peer_discovery_backend, rabbit_peer_discovery_classic_config}] - }, %% used by rabbit_peer_discovery_classic_config {cluster_nodes, {[], disc}}, diff --git a/deps/rabbit/docs/rabbitmq.conf.example b/deps/rabbit/docs/rabbitmq.conf.example index 2a3f3f590d4f..b08bd86135ef 100644 --- a/deps/rabbit/docs/rabbitmq.conf.example +++ b/deps/rabbit/docs/rabbitmq.conf.example @@ -404,33 +404,11 @@ -## Fraction of the high watermark limit at which queues start to -## page message out to disc in order to free up memory. -## For example, when vm_memory_high_watermark is set to 0.4 and this value is set to 0.5, -## paging can begin as early as when 20% of total available RAM is used by the node. -## -## Values greater than 1.0 can be dangerous and should be used carefully. -## -## One alternative to this is to use durable queues and publish messages -## as persistent (delivery mode = 2). With this combination queues will -## move messages to disk much more rapidly. -## -## Another alternative is to configure queues to page all messages (both -## persistent and transient) to disk as quickly -## as possible, see https://www.rabbitmq.com/docs/lazy-queues. -## -# vm_memory_high_watermark_paging_ratio = 0.5 - ## Selects Erlang VM memory consumption calculation strategy. Can be `allocated`, `rss` or `legacy` (aliased as `erlang`), ## Introduced in 3.6.11. `rss` is the default as of 3.6.12. ## See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background. # vm_memory_calculation_strategy = rss -## Interval (in milliseconds) at which we perform the check of the memory -## levels against the watermarks. -## -# memory_monitor_interval = 2500 - ## The total memory available can be calculated from the OS resources ## - default option - or provided as a configuration parameter. # total_memory_available_override_value = 2GB diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index f4ea2f18e4a8..2fe114c4a609 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -1149,6 +1149,8 @@ fun(Conf) -> end end}. +%% DEPRECATED. Not used since RabbitMQ 4.0 +%% %% Fraction of the high watermark limit at which queues start to %% page message out to disc in order to free up memory. %% @@ -1160,6 +1162,8 @@ end}. "rabbit.vm_memory_high_watermark_paging_ratio", [{datatype, float}, {validators, ["less_than_1"]}]}. +%% DEPRECATED. Not used since RabbitMQ 4.0 +%% %% Interval (in milliseconds) at which we perform the check of the memory %% levels against the watermarks. %% @@ -2554,6 +2558,7 @@ end}. %% Backing queue version %% +%% DEPRECATED. Not used since RabbitMQ 4.0 {mapping, "classic_queue.default_version", "rabbit.classic_queue_default_version", [ {datatype, integer}, {validators, ["non_zero_positive_integer"]} diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets index 79ac25b4d576..3359f0cf905f 100644 --- a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets +++ b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets @@ -372,6 +372,7 @@ tcp_listen_options.exit_on_close = false", vm_memory_high_watermark.relative = 0.4", [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}], []}, + %% DEPRECATED; just for backwards compatibility {vm_memory_watermark_paging_ratio, "vm_memory_high_watermark_paging_ratio = 0.75 vm_memory_high_watermark.relative = 0.4", @@ -379,6 +380,7 @@ tcp_listen_options.exit_on_close = false", [{vm_memory_high_watermark_paging_ratio,0.75}, {vm_memory_high_watermark,0.4}]}], []}, + %% DEPRECATED; just for backwards compatibility {memory_monitor_interval, "memory_monitor_interval = 5000", [{rabbit, [{memory_monitor_interval, 5000}]}], diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex deleted file mode 100644 index 3cc58a8c9127..000000000000 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/hipe_compile_command.ex +++ /dev/null @@ -1,99 +0,0 @@ -## This Source Code Form is subject to the terms of the Mozilla Public -## License, v. 2.0. If a copy of the MPL was not distributed with this -## file, You can obtain one at https://mozilla.org/MPL/2.0/. -## -## Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved. - -defmodule RabbitMQ.CLI.Ctl.Commands.HipeCompileCommand do - @moduledoc """ - HiPE support has been deprecated since Erlang/OTP 22 (mid-2019) and - won't be a part of Erlang/OTP 24. - - Therefore this command is DEPRECATED and is no-op. - """ - - alias RabbitMQ.CLI.Core.{DocGuide, Validators} - import RabbitMQ.CLI.Core.CodePath - - @behaviour RabbitMQ.CLI.CommandBehaviour - - # - # API - # - - def distribution(_), do: :none - - use RabbitMQ.CLI.Core.MergesNoDefaults - - def validate([], _), do: {:validation_failure, :not_enough_args} - - def validate([target_dir], opts) do - :ok - |> Validators.validate_step(fn -> - case acceptable_path?(target_dir) do - true -> :ok - false -> {:error, {:bad_argument, "Target directory path cannot be blank"}} - end - end) - |> Validators.validate_step(fn -> - case File.dir?(target_dir) do - true -> - :ok - - false -> - case File.mkdir_p(target_dir) do - :ok -> - :ok - - {:error, perm} when perm == :eperm or perm == :eacces -> - {:error, - {:bad_argument, - "Cannot create target directory #{target_dir}: insufficient permissions"}} - end - end - end) - |> Validators.validate_step(fn -> require_rabbit(opts) end) - end - - def validate(_, _), do: {:validation_failure, :too_many_args} - - def run([_target_dir], _opts) do - :ok - end - - use RabbitMQ.CLI.DefaultOutput - - def usage, do: "hipe_compile " - - def usage_additional do - [ - ["", "Target directory for HiPE-compiled modules"] - ] - end - - def usage_doc_guides() do - [ - DocGuide.configuration(), - DocGuide.erlang_versions() - ] - end - - def help_section(), do: :deprecated - - def description() do - "DEPRECATED. This command is a no-op. HiPE is no longer supported by modern Erlang versions" - end - - def banner([_target_dir], _) do - "This command is a no-op. HiPE is no longer supported by modern Erlang versions" - end - - # - # Implementation - # - - # Accepts any non-blank path - defp acceptable_path?(value) do - String.length(String.trim(value)) != 0 - end -end diff --git a/deps/rabbitmq_prometheus/docker/docker-entrypoint.sh b/deps/rabbitmq_prometheus/docker/docker-entrypoint.sh index b5994f87a73a..83f88b1b4b40 100755 --- a/deps/rabbitmq_prometheus/docker/docker-entrypoint.sh +++ b/deps/rabbitmq_prometheus/docker/docker-entrypoint.sh @@ -55,7 +55,6 @@ rabbitConfigKeys=( default_pass default_user default_vhost - hipe_compile vm_memory_high_watermark ) fileConfigKeys=( @@ -267,7 +266,7 @@ rabbit_env_config() { local val="${!var:-}" local rawVal="$val" case "$conf" in - fail_if_no_peer_cert|hipe_compile) + fail_if_no_peer_cert) case "${val,,}" in false|no|0|'') rawVal='false' ;; true|yes|1|*) rawVal='true' ;; diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-metrics.conf b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-metrics.conf index a253d823d19e..c8ea2c3a7063 100644 --- a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-metrics.conf +++ b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-metrics.conf @@ -5,7 +5,6 @@ management.listener.port = 15672 management.listener.ssl = false vm_memory_high_watermark.absolute = 768MiB -vm_memory_high_watermark_paging_ratio = 0.2 cluster_name = rabbitmq-dist-metrics diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf index 94d6aaab01bf..19c08a7c6aa9 100644 --- a/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf +++ b/deps/rabbitmq_prometheus/docker/rabbitmq-dist-tls.conf @@ -5,7 +5,6 @@ management.listener.port = 15672 management.listener.ssl = false vm_memory_high_watermark.absolute = 4GiB -vm_memory_high_watermark_paging_ratio = 0.9 disk_free_limit.absolute = 2048MiB cluster_name = rabbitmq-dist-tls diff --git a/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf b/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf index b276485b2722..82d548fd34bd 100644 --- a/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf +++ b/deps/rabbitmq_prometheus/docker/rabbitmq-overview.conf @@ -5,7 +5,6 @@ management.listener.port = 15672 management.listener.ssl = false vm_memory_high_watermark.absolute = 768MiB -vm_memory_high_watermark_paging_ratio = 0.2 cluster_name = rabbitmq-overview diff --git a/packaging/docker-image/Dockerfile b/packaging/docker-image/Dockerfile index b74b68d5b468..5fe46736682d 100644 --- a/packaging/docker-image/Dockerfile +++ b/packaging/docker-image/Dockerfile @@ -146,7 +146,6 @@ RUN set -eux; \ --prefix="$ERLANG_INSTALL_PATH_PREFIX" \ --host="$hostArch" \ --build="$buildArch" \ - --disable-hipe \ --disable-sctp \ --disable-silent-rules \ --enable-builtin-zlib \ @@ -166,7 +165,6 @@ RUN set -eux; \ --without-et \ --without-eunit \ --without-ftp \ - --without-hipe \ --without-jinterface \ --without-megaco \ --without-observer \ @@ -329,4 +327,4 @@ RUN set eux; \ rm -rf /var/lib/apt/lists/*; \ rabbitmqadmin --version -EXPOSE 15671 15672 \ No newline at end of file +EXPOSE 15671 15672