Merge pull request #1660 from rabbitmq/rabbitmq-server-1659

Correct resource limit defaults

Author: michaelklishin

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"
 

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" {