Merge pull request #12140 from rabbitmq/remove-unused-configs

Remove some dead code and configuration options
rabbitmq · Aug 29, 2024 · 585a8ff · 585a8ff
2 parents aa6c47c + 9b828c0
commit 585a8ff
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 147 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -372,13 +372,15 @@ 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",
   [{rabbit,
        [{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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
+EXPOSE 15671 15672