diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-08-02 23:20:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 23:20:19 +0300 |
| commit | b211e288263f09b9eba08638651a3ff96f1e89d4 (patch) | |
| tree | 17bbbabb9899279e52af7d9ec8a0cdef228c62e2 | |
| parent | 08c6675a979856d2444a249079268d1f494e7748 (diff) | |
| parent | 1c125283dca34c8307c9e63b4f72fc99430dcbd1 (diff) | |
| download | rabbitmq-server-git-b211e288263f09b9eba08638651a3ff96f1e89d4.tar.gz | |
Merge pull request #1660 from rabbitmq/rabbitmq-server-1659
Correct resource limit defaults
| -rwxr-xr-x | scripts/rabbitmq-env | 4 | ||||
| -rw-r--r-- | test/rabbitmq-env.bats | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 25ed644c37..3181c1276a 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -85,11 +85,11 @@ DEFAULT_SCHEDULER_BIND_TYPE="db" [ -n "$SCHEDULER_BIND_TYPE" ] || SCHEDULER_BIND_TYPE="$DEFAULT_SCHEDULER_BIND_TYPE" [ -n "$RABBITMQ_SCHEDULER_BIND_TYPE" ] || RABBITMQ_SCHEDULER_BIND_TYPE="$SCHEDULER_BIND_TYPE" -DEFAULT_DISTRIBUTION_BUFFER_SIZE=1280000 +DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000 [ -n "$DISTRIBUTION_BUFFER_SIZE" ] || DISTRIBUTION_BUFFER_SIZE="$DEFAULT_DISTRIBUTION_BUFFER_SIZE" [ -n "$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] || RABBITMQ_DISTRIBUTION_BUFFER_SIZE="$DISTRIBUTION_BUFFER_SIZE" -DEFAULT_MAX_NUMBER_OF_PROCESSES=10485760 +DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576 [ -n "$MAX_NUMBER_OF_PROCESSES" ] || MAX_NUMBER_OF_PROCESSES="$DEFAULT_MAX_NUMBER_OF_PROCESSES" [ -n "$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] || RABBITMQ_MAX_NUMBER_OF_PROCESSES="$MAX_NUMBER_OF_PROCESSES" diff --git a/test/rabbitmq-env.bats b/test/rabbitmq-env.bats index 0fccb42c81..4a016960c5 100644 --- a/test/rabbitmq-env.bats +++ b/test/rabbitmq-env.bats @@ -40,16 +40,16 @@ setup() { @test "default Erlang distribution buffer size" { source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env" - echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 1280000 ', but got: $RABBITMQ_SERVER_ERL_ARGS" - [[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 1280000 "* ]] + echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 128000 ', but got: $RABBITMQ_SERVER_ERL_ARGS" + [[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 128000 "* ]] } @test "can configure Erlang distribution buffer size via conf file" { - echo 'DISTRIBUTION_BUFFER_SIZE=1000000' > "$RABBITMQ_CONF_ENV_FILE" + echo 'DISTRIBUTION_BUFFER_SIZE=123123' > "$RABBITMQ_CONF_ENV_FILE" source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env" - echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 1000000 ', but got: $RABBITMQ_SERVER_ERL_ARGS" - [[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 1000000 "* ]] + echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 123123 ', but got: $RABBITMQ_SERVER_ERL_ARGS" + [[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 123123 "* ]] } @test "can configure Erlang distribution buffer size via env" { @@ -70,8 +70,8 @@ setup() { @test "default Erlang maximum number of processes" { source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env" - echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +P 10485760 ', but got: $RABBITMQ_SERVER_ERL_ARGS" - [[ $RABBITMQ_SERVER_ERL_ARGS == *" +P 10485760 "* ]] + echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +P 1048576 ', but got: $RABBITMQ_SERVER_ERL_ARGS" + [[ $RABBITMQ_SERVER_ERL_ARGS == *" +P 1048576 "* ]] } @test "can configure Erlang maximum number of processes via conf file" { |