Merge pull request #5699 from rabbitmq/mergify/bp/v3.10.x/pr-5698

Set ERL_MAX_ETS_TABLES and ERL_MAX_PORTS in the same manner as on Win… (backport #5684) (backport #5698)
rabbitmq · Aug 31, 2022 · 221b7cc · 221b7cc
2 parents 21e7268 + fa687d1
commit 221b7cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/deps/rabbit/scripts/rabbitmq-env b/deps/rabbit/scripts/rabbitmq-env
@@ -94,10 +94,21 @@ ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
 saved_RABBITMQ_PID_FILE="$RABBITMQ_PID_FILE"
 
 ## Get configuration variables from the configure environment file
-[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE}
-if [ -f "${RABBITMQ_CONF_ENV_FILE}" ]; then
+[ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE="$CONF_ENV_FILE"
+if [ -f "$RABBITMQ_CONF_ENV_FILE" ]; then
     CONF_ENV_FILE_PHASE=rabbitmq-env
-    . ${RABBITMQ_CONF_ENV_FILE} || true
+    . "$RABBITMQ_CONF_ENV_FILE" || true
+fi
+
+# Bump ETS table limit to 50000
+if [ -z "$ERL_MAX_ETS_TABLES" ]; then
+    export ERL_MAX_ETS_TABLES=50000
+fi
+
+# Default is defined here:
+# https://github.com/erlang/otp/blob/master/erts/emulator/beam/erl_port.h
+if [ -z "$ERL_MAX_PORTS" ]; then
+    export ERL_MAX_PORTS=65536
 fi
 
 [ -n "$ERL_EPMD_PORT" ] && export ERL_EPMD_PORT

diff --git a/deps/rabbit/scripts/rabbitmq-server b/deps/rabbit/scripts/rabbitmq-server
@@ -18,11 +18,6 @@ SCRIPTS_DIR=$(dirname "$0")
 
 RABBITMQ_DEFAULT_ALLOC_ARGS="+MBas ageffcbf +MHas ageffcbf +MBlmbcs 512 +MHlmbcs 512 +MMmcs 30"
 
-# Bump ETS table limit to 50000
-if [ "x" = "x$ERL_MAX_ETS_TABLES" ]; then
-    ERL_MAX_ETS_TABLES=50000
-fi
-
 check_start_params() {
     check_not_empty RABBITMQ_BOOT_MODULE
     check_not_empty SASL_BOOT_FILE