diff options
| author | Gerhard Lazu <gerhard@lazu.co.uk> | 2018-02-23 17:58:47 +0000 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-02-23 21:31:10 +0300 |
| commit | c182d51294dd560877ad98a250015869b8f8015b (patch) | |
| tree | a2a40fe202efac52dd4983129bac2e0a0d4dd8bf | |
| parent | 3e7f271a2f6c49e37170a1169d2c495f4983029b (diff) | |
| download | rabbitmq-server-git-c182d51294dd560877ad98a250015869b8f8015b.tar.gz | |
Make maximum number of Erlang atoms configurable via env
This was the only property in SERVER_ERL_ARGS that was not configurable.
Even though it's unlikely that this will need to be increased above the
existing 5 million default, we are consistent in allowing all properties
in SERVER_ERL_ARGS to be cofigured.
(cherry picked from commit b1e163fd6f385af03c65dbe421def3597ce01df2)
| -rwxr-xr-x | scripts/rabbitmq-env | 5 | ||||
| -rw-r--r-- | test/rabbitmq-env.bats | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 3591ec856f..a467f3b0ea 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -90,8 +90,11 @@ DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000 DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576 [ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES=="${DEFAULT_MAX_NUMBER_OF_PROCESSES}" +DEFAULT_MAX_NUMBER_OF_ATOMS=5000000 +[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS=="${DEFAULT_MAX_NUMBER_OF_ATOMS}" + ## Common server defaults -SERVER_ERL_ARGS="+P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t 5000000 +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbbl $RABBITMQ_DISTRIBUTION_BUFFER_SIZE" +SERVER_ERL_ARGS="+P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t $RABBITMQ_MAX_NUMBER_OF_ATOMS +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbbl $RABBITMQ_DISTRIBUTION_BUFFER_SIZE" # 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/test/rabbitmq-env.bats b/test/rabbitmq-env.bats index ac15e0dc06..ce0ece1cfa 100644 --- a/test/rabbitmq-env.bats +++ b/test/rabbitmq-env.bats @@ -27,3 +27,13 @@ echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+P 2000000', but got: $RABBITMQ_SERVER_ERL_ARGS" [[ $RABBITMQ_SERVER_ERL_ARGS == *+P\ 2000000* ]] } + +@test "can configure RABBITMQ_MAX_NUMBER_OF_ATOMS" { + declare -r scripts_dir="$BATS_TEST_DIRNAME/../scripts" + export RABBITMQ_SCRIPTS_DIR="$scripts_dir" + export RABBITMQ_CONF_ENV_FILE="$BATS_TMPDIR/rabbitmq-env.conf" + echo 'RABBITMQ_MAX_NUMBER_OF_ATOMS=10000000' > "$RABBITMQ_CONF_ENV_FILE" + source "$scripts_dir/rabbitmq-env" + echo "expected RABBITMQ_SERVER_ERL_ARGS to contain '+t 10000000', but got: $RABBITMQ_SERVER_ERL_ARGS" + [[ $RABBITMQ_SERVER_ERL_ARGS == *+t\ 10000000* ]] +} |