Skip to content

Commit 5d777cc

Browse files
Merge pull request #4256 from rabbitmq/mergify/bp/v3.9.x/pr-4255
Disable kernel.prevent_overlapping_partitions early on boot (backport #4253) (backport #4255)
2 parents b527862 + f8e955d commit 5d777cc

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ setup(Context) ->
2424
%% TODO: Check if directories/files are inside Mnesia dir.
2525

2626
ok = set_default_config(),
27+
ok = disable_kernel_overlapping_partitions(),
2728

2829
AdditionalConfigFiles = find_additional_config_files(Context),
2930
AdvancedConfigFile = find_actual_advanced_config_file(Context),
@@ -542,3 +543,9 @@ get_input_iodevice() ->
542543
end
543544
end
544545
end.
546+
547+
disable_kernel_overlapping_partitions() ->
548+
%% This new "fixed" behavior seriously affects our own partition handling,
549+
%% and potentially even libraries such as Aten and Ra,
550+
%% so disable this to be forward-compatible with Erlang 25
551+
application:set_env(kernel, prevent_overlapping_partitions, false).

deps/rabbit/scripts/rabbitmq-server

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ start_rabbitmq_server() {
8181
${RABBITMQ_SERVER_START_ARGS} \
8282
-syslog logger '[]' \
8383
-syslog syslog_error_logger false \
84+
-kernel prevent_overlapping_partitions false \
8485
"$@"
8586
}
8687

deps/rabbit/scripts/rabbitmq-server.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ if "!RABBITMQ_ALLOW_INPUT!"=="" (
7070
!RABBITMQ_SERVER_START_ARGS! ^
7171
-syslog logger [] ^
7272
-syslog syslog_error_logger false ^
73+
-kernel prevent_overlapping_partitions false ^
7374
!STAR!
7475

7576
if ERRORLEVEL 1 (

deps/rabbit/scripts/rabbitmq-service.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
200200
!RABBITMQ_DIST_ARG! ^
201201
-syslog logger [] ^
202202
-syslog syslog_error_logger false ^
203+
-kernel prevent_overlapping_partitions false ^
203204
!STARVAR!
204205

205206
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

0 commit comments

Comments
 (0)