diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-10-20 16:33:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 16:33:41 -0700 |
| commit | 13483d9b9e06c5908584b5524416f808900e70a4 (patch) | |
| tree | 12aedc76d1f916fe83c8e81799bbd7bb39a7cd41 | |
| parent | de0bcbd7b7f3c9a0b010ccb75e31177377d3c890 (diff) | |
| parent | cd39bf5ff35f11e8828f7a33548d532566f62a1e (diff) | |
| download | rabbitmq-server-git-13483d9b9e06c5908584b5524416f808900e70a4.tar.gz | |
Merge pull request #2478 from rabbitmq/rabbitmq-server-2473
Remove all code related to RABBITMQ_IO_THREAD_POOL_SIZE
| -rwxr-xr-x | scripts/rabbitmq-env | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 18 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 5 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 5 |
4 files changed, 0 insertions, 29 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index afae3651aa..90702c43bb 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -130,7 +130,6 @@ SERVER_ERL_ARGS=" +P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t $RABBITMQ_MAX_NUMBER_O [ "x" = "x$RABBITMQ_CTL_DIST_PORT_MIN" ] && RABBITMQ_CTL_DIST_PORT_MIN='35672' [ "x" = "x$RABBITMQ_CTL_DIST_PORT_MAX" ] && RABBITMQ_CTL_DIST_PORT_MAX="$(($RABBITMQ_CTL_DIST_PORT_MIN + 10))" -[ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${IO_THREAD_POOL_SIZE} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} [ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS} diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index b464c5fa09..82058dcb26 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -23,25 +23,9 @@ if [ "x" = "x$ERL_MAX_ETS_TABLES" ]; then ERL_MAX_ETS_TABLES=50000 fi -# Lazy initialization of threed pool size - if it wasn't set -# explicitly. This parameter is only needed when server is starting, -# so it makes no sense to do this calculations in rabbitmq-env or -# rabbitmq-defaults scripts. -ensure_thread_pool_size() { - if [ -z "${RABBITMQ_IO_THREAD_POOL_SIZE}" ]; then - RABBITMQ_IO_THREAD_POOL_SIZE=$( - erl \ - -noinput \ - -boot "${CLEAN_BOOT_FILE}" \ - -s rabbit_misc report_default_thread_pool_size - ) - fi -} - check_start_params() { check_not_empty RABBITMQ_BOOT_MODULE check_not_empty SASL_BOOT_FILE - check_not_empty RABBITMQ_IO_THREAD_POOL_SIZE } check_not_empty() { @@ -59,7 +43,6 @@ start_rabbitmq_server() { set -e _rmq_env_set_erl_libs - ensure_thread_pool_size RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput" @@ -92,7 +75,6 @@ start_rabbitmq_server() { ${RABBITMQ_START_RABBIT} \ -boot "${SASL_BOOT_FILE}" \ +W w \ - +A ${RABBITMQ_IO_THREAD_POOL_SIZE} \ ${RABBITMQ_DEFAULT_ALLOC_ARGS} \ ${RABBITMQ_SERVER_ERL_ARGS} \ ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 3eb033efc2..3a386b63c4 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -47,10 +47,6 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( set RABBITMQ_START_RABBIT=!RABBITMQ_START_RABBIT! -s "!RABBITMQ_BOOT_MODULE!" boot
)
-if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
- set RABBITMQ_IO_THREAD_POOL_SIZE=64
-)
-
set ENV_OK=true
CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!
@@ -68,7 +64,6 @@ if "!RABBITMQ_ALLOW_INPUT!"=="" ( !RABBITMQ_START_RABBIT! ^
-boot "!SASL_BOOT_FILE!" ^
+W w ^
-+A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
!RABBITMQ_DEFAULT_ALLOC_ARGS! ^
!RABBITMQ_SERVER_ERL_ARGS! ^
!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index b42e0dd89a..0b7906d4bf 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -176,10 +176,6 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( set RABBITMQ_START_RABBIT=-s "!RABBITMQ_BOOT_MODULE!" boot
)
-if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
- set RABBITMQ_IO_THREAD_POOL_SIZE=64
-)
-
if "!RABBITMQ_SERVICE_RESTART!"=="" (
set RABBITMQ_SERVICE_RESTART=restart
)
@@ -197,7 +193,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^ !RABBITMQ_START_RABBIT! ^
-boot "!SASL_BOOT_FILE!" ^
+W w ^
-+A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
!RABBITMQ_DEFAULT_ALLOC_ARGS! ^
!RABBITMQ_SERVER_ERL_ARGS! ^
!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^
|