Bump the default ets tables limit

3 files changed, 21 insertions, 5 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 7b0599e88f..10f9ab20e4 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -123,6 +123,11 @@ else
     RABBIT_SASL_ERROR_LOGGER='{file,"'${RABBITMQ_SASL_LOGS}'"}'
 fi
 
+# Bump ETS table limit to 50000
+if ["x" = "x$ERL_MAX_ETS_TABLES"]; then
+    ERL_MAX_ETS_TABLES=50000
+fi
+
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and
 # there is no other way of preventing their expansion.
@@ -151,6 +156,7 @@ start_rabbitmq_server() {
     ensure_thread_pool_size
     check_start_params &&
     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+    ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
     exec ${ERL_DIR}erl \
         -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
         ${RABBITMQ_START_RABBIT} \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 585a830efa..49c1bd1e49 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -99,11 +99,15 @@ if "!RABBITMQ_NODE_ONLY!"=="" (
 

 if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (

     set RABBITMQ_IO_THREAD_POOL_SIZE=64

-) 

+)

 

+rem Bump ETS table limit to 50000

+if "!ERL_MAX_ETS_TABLES!"=="" (

+    set ERL_MAX_ETS_TABLES=50000

+)

 

 set ENV_OK=true

-CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!

 CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

 CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

 

@@ -145,7 +149,7 @@ EXIT /B 0
 if "%~2"=="" (

     ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaults, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

     set ENV_OK=false

-    EXIT /B 78 

+    EXIT /B 78

     )

 EXIT /B 0

 

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 9e87de6930..ab88120b74 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -105,7 +105,7 @@ if not exist "!RABBITMQ_BASE!" (
 )

 

 set ENV_OK=true

-CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!

 CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

 CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

 

@@ -173,6 +173,11 @@ if "!RABBITMQ_SERVICE_RESTART!"=="" (
     set RABBITMQ_SERVICE_RESTART=restart

 )

 

+rem Bump ETS table limit to 50000

+if "!ERL_MAX_ETS_TABLES!"=="" (

+    set ERL_MAX_ETS_TABLES=50000

+)

+

 set ERLANG_SERVICE_ARGUMENTS= ^

 -pa "!RABBITMQ_EBIN_ROOT!" ^

 -boot start_sasl ^

@@ -210,6 +215,7 @@ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!
 -machine "!ERLANG_SERVICE_MANAGER_PATH!\erl.exe" ^

 -env ERL_CRASH_DUMP="!RABBITMQ_BASE:\=/!/erl_crash.dump" ^

 -env ERL_LIBS="!ERL_LIBS!" ^

+-env ERL_MAX_ETS_TABLES="!ERL_MAX_ETS_TABLES!" ^

 -workdir "!RABBITMQ_BASE!" ^

 -stopaction "rabbit:stop_and_halt()." ^

 !RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

@@ -238,7 +244,7 @@ EXIT /B 0
 if "%~2"=="" (

     ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env, rabbitmq-default, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

     set ENV_OK=false

-    EXIT /B 78 

+    EXIT /B 78

     )

 EXIT /B 0