Skip to content

Commit b8d5ca8

Browse files
Correct resource limit defaults: Erlang distribution buffer size and others
They were bumped to x10 the values in 118b448 by mistake. Kudos to Chris Friesen for reporting this. Closes #1659. (cherry picked from commit 594dc10)
1 parent e1c9dce commit b8d5ca8

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

scripts/rabbitmq-env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ DEFAULT_SCHEDULER_BIND_TYPE="db"
8585
[ -n "$SCHEDULER_BIND_TYPE" ] || SCHEDULER_BIND_TYPE="$DEFAULT_SCHEDULER_BIND_TYPE"
8686
[ -n "$RABBITMQ_SCHEDULER_BIND_TYPE" ] || RABBITMQ_SCHEDULER_BIND_TYPE="$SCHEDULER_BIND_TYPE"
8787

88-
DEFAULT_DISTRIBUTION_BUFFER_SIZE=1280000
88+
DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
8989
[ -n "$DISTRIBUTION_BUFFER_SIZE" ] || DISTRIBUTION_BUFFER_SIZE="$DEFAULT_DISTRIBUTION_BUFFER_SIZE"
9090
[ -n "$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] || RABBITMQ_DISTRIBUTION_BUFFER_SIZE="$DISTRIBUTION_BUFFER_SIZE"
9191

9292
DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576
9393
[ -n "$MAX_NUMBER_OF_PROCESSES" ] || MAX_NUMBER_OF_PROCESSES="$DEFAULT_MAX_NUMBER_OF_PROCESSES"
9494
[ -n "$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] || RABBITMQ_MAX_NUMBER_OF_PROCESSES="$MAX_NUMBER_OF_PROCESSES"
9595

96-
DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
96+
DEFAULT_MAX_NUMBER_OF_ATOMS=500000
9797
[ -n "$MAX_NUMBER_OF_ATOMS" ] || MAX_NUMBER_OF_ATOMS="$DEFAULT_MAX_NUMBER_OF_ATOMS"
9898
[ -n "$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] || RABBITMQ_MAX_NUMBER_OF_ATOMS="$MAX_NUMBER_OF_ATOMS"
9999

test/rabbitmq-env.bats

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ setup() {
4040
@test "default Erlang distribution buffer size" {
4141
source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env"
4242

43-
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 1280000 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
44-
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 1280000 "* ]]
43+
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 128000 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
44+
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 128000 "* ]]
4545
}
4646

4747
@test "can configure Erlang distribution buffer size via conf file" {
48-
echo 'DISTRIBUTION_BUFFER_SIZE=1000000' > "$RABBITMQ_CONF_ENV_FILE"
48+
echo 'DISTRIBUTION_BUFFER_SIZE=123123' > "$RABBITMQ_CONF_ENV_FILE"
4949
source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env"
5050

51-
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 1000000 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
52-
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 1000000 "* ]]
51+
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +zdbbl 123123 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
52+
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +zdbbl 123123 "* ]]
5353
}
5454

5555
@test "can configure Erlang distribution buffer size via env" {
@@ -100,8 +100,8 @@ setup() {
100100
@test "default Erlang maximum number of atoms" {
101101
source "$RABBITMQ_SCRIPTS_DIR/rabbitmq-env"
102102

103-
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +t 5000000 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
104-
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +t 5000000 "* ]]
103+
echo "expected RABBITMQ_SERVER_ERL_ARGS to contain ' +t 500000 ', but got: $RABBITMQ_SERVER_ERL_ARGS"
104+
[[ $RABBITMQ_SERVER_ERL_ARGS == *" +t 500000 "* ]]
105105
}
106106

107107
@test "can configure Erlang maximum number of atoms via conf file" {

0 commit comments

Comments
 (0)