diff options
| author | Michael Klishin <klishinm@vmware.com> | 2022-03-10 16:02:07 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 16:02:07 +0600 |
| commit | 387410c789d26d57c40c2c7cd807cb3b5a5b4201 (patch) | |
| tree | 95448cda98619129f9983de94859c4e20045af80 | |
| parent | 29b912475fa3779bb45908746f6534a1cea6cd66 (diff) | |
| parent | 86c258df2fff2f3cd6f39aae50bcfcfb5e8fa9a1 (diff) | |
| download | rabbitmq-server-git-387410c789d26d57c40c2c7cd807cb3b5a5b4201.tar.gz | |
Merge pull request #4253 from rabbitmq/mk-disable-kernel-prevent-overlapping-partitions
Disable kernel.prevent_overlapping_partitions early on boot
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl | 7 | ||||
| -rwxr-xr-x | deps/rabbit/scripts/rabbitmq-server | 1 | ||||
| -rw-r--r-- | deps/rabbit/scripts/rabbitmq-server.bat | 1 | ||||
| -rw-r--r-- | deps/rabbit/scripts/rabbitmq-service.bat | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl index 99130b8d37..bab6e94ef4 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -24,6 +24,7 @@ setup(Context) -> %% TODO: Check if directories/files are inside Mnesia dir. ok = set_default_config(), + ok = disable_kernel_overlapping_partitions(), AdditionalConfigFiles = find_additional_config_files(Context), AdvancedConfigFile = find_actual_advanced_config_file(Context), @@ -585,3 +586,9 @@ get_input_iodevice() -> end end end. + +disable_kernel_overlapping_partitions() -> + %% This new "fixed" behavior seriously affects our own partition handling, + %% and potentially even libraries such as Aten and Ra, + %% so disable this to be forward-compatible with Erlang 25 + application:set_env(kernel, prevent_overlapping_partitions, false).
\ No newline at end of file diff --git a/deps/rabbit/scripts/rabbitmq-server b/deps/rabbit/scripts/rabbitmq-server index bccd91cdcf..c9612d8946 100755 --- a/deps/rabbit/scripts/rabbitmq-server +++ b/deps/rabbit/scripts/rabbitmq-server @@ -81,6 +81,7 @@ start_rabbitmq_server() { ${RABBITMQ_SERVER_START_ARGS} \ -syslog logger '[]' \ -syslog syslog_error_logger false \ + -kernel prevent_overlapping_partitions false \ "$@" } diff --git a/deps/rabbit/scripts/rabbitmq-server.bat b/deps/rabbit/scripts/rabbitmq-server.bat index 19cfff2674..970a101479 100644 --- a/deps/rabbit/scripts/rabbitmq-server.bat +++ b/deps/rabbit/scripts/rabbitmq-server.bat @@ -70,6 +70,7 @@ if "!RABBITMQ_ALLOW_INPUT!"=="" ( !RABBITMQ_SERVER_START_ARGS! ^
-syslog logger [] ^
-syslog syslog_error_logger false ^
+-kernel prevent_overlapping_partitions false ^
!STAR!
if ERRORLEVEL 1 (
diff --git a/deps/rabbit/scripts/rabbitmq-service.bat b/deps/rabbit/scripts/rabbitmq-service.bat index 7554890530..7870417b46 100644 --- a/deps/rabbit/scripts/rabbitmq-service.bat +++ b/deps/rabbit/scripts/rabbitmq-service.bat @@ -200,6 +200,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ !RABBITMQ_DIST_ARG! ^
-syslog logger [] ^
-syslog syslog_error_logger false ^
+-kernel prevent_overlapping_partitions false ^
!STARVAR!
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!
|