diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-12-17 02:43:09 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-12-17 02:43:09 +0300 |
| commit | 8a98bdb0808840d2dbd3d70937cadfe2bdb3bb80 (patch) | |
| tree | e9f9bd62dcdb8f77ccca1d7ba8dd7394d95f10a2 /scripts | |
| parent | 806cd800b055a660988c5b1da6ae388bb72fa3a7 (diff) | |
| parent | d4bbbead10c128290b030f2769712dac666ab5f4 (diff) | |
| download | rabbitmq-server-git-8a98bdb0808840d2dbd3d70937cadfe2bdb3bb80.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 6 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 33369616ef..cd56b67d73 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -163,6 +163,11 @@ else RABBITMQ_LAGER_HANDLER_UPGRADE='"'${RABBITMQ_UPGRADE_LOG}'"' 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. @@ -191,6 +196,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 a15f24e586..c00dee1913 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -137,6 +137,10 @@ 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!
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 347a5e62ae..92b3393670 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -225,6 +225,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 ^
@@ -262,6 +267,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! ^
|