Merge local `node_health_check` into `master`

4 files changed, 18 insertions, 12 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 62cff0b248..6a7b2f91f0 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -62,8 +62,11 @@ RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")"
 ## Set defaults
 . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
 
+DEFAULT_SCHEDULER_BIND_TYPE="db"
+[ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
+
 ## Common defaults
-SERVER_ERL_ARGS="+P 1048576"
+SERVER_ERL_ARGS="+P 1048576 +stbt $RABBITMQ_SCHEDULER_BIND_TYPE "
 
 # We save the current value of $RABBITMQ_PID_FILE in case it was set by
 # an init script. If $CONF_ENV_FILE overrides it again, we must ignore
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 4c5691bedb..a4a5c9dc19 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -30,10 +30,14 @@ REM ## Set defaults
 REM . ${SCRIPT_DIR}/rabbitmq-defaults

 call "%SCRIPT_DIR%\rabbitmq-defaults.bat"

 

-REM These common defaults aren't referenced in the batch scripts

-REM ## Common defaults

-REM SERVER_ERL_ARGS="+P 1048576"

-REM

+set DEFAULT_SCHEDULER_BIND_TYPE=db

+

+REM [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}

+REM set the default scheduling bind type

+if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (

+    set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!

+)

+

 REM # warn about old rabbitmq.conf file, if no new one

 REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \

 REM    [ ! -f ${CONF_ENV_FILE} ] ; then

@@ -41,9 +45,8 @@ REM     echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
 REM     echo "location has moved to ${CONF_ENV_FILE}"

 REM fi

 

-REM ERL_ARGS aren't referenced in the batch scripts

 REM Common defaults

-REM set SERVER_ERL_ARGS=+P 1048576

+set SERVER_ERL_ARGS=+P 1048576 +stbt !RABBITMQ_SCHEDULER_BIND_TYPE! 

 

 REM ## Get configuration variables from the configure environment file

 REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true

@@ -151,7 +154,9 @@ if "!RABBITMQ_DIST_PORT!"=="" (
 )

 

 REM [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}

-REM No Windows equivalent

+if "!RABBITMQ_SERVER_ERL_ARGS!"=="" (

+    set RABBITMQ_SERVER_ERL_ARGS=!SERVER_ERL_ARGS!

+)

 

 REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}

 

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 20a0bd8823..a15f24e586 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -156,9 +156,8 @@ if "!ENV_OK!"=="false" (
 !RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

-+P 1048576 ^

-!RABBITMQ_LISTEN_ARG! ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

+!RABBITMQ_LISTEN_ARG! ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 2fb34ddb28..c9e404db46 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -232,9 +232,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_CONFIG_ARG! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

-+P 1048576 ^

-!RABBITMQ_LISTEN_ARG! ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

+!RABBITMQ_LISTEN_ARG! ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^