docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add total_memory_available_override_value support in 3.7

This commit is contained in:
Tianon Gravi 2017-12-21 09:44:07 -08:00
parent ede7f3f506
commit dc9451b8f9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3.7/alpine/docker-entrypoint.sh
View File

@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
if [ -n "$memLimitB" ]; then if [ -n "$memLimitB" ]; then
# if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly) # if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly)
# https://github.com/rabbitmq/rabbitmq-server/pull/1234 # https://github.com/rabbitmq/rabbitmq-server/pull/1234
: # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" rabbit_set_config 'total_memory_available_override_value' "$memLimitB"
# TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0)
fi fi
# https://www.rabbitmq.com/memory.html#memsup-usage # https://www.rabbitmq.com/memory.html#memsup-usage
if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then

3
3.7/debian/docker-entrypoint.sh
View File

@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
if [ -n "$memLimitB" ]; then if [ -n "$memLimitB" ]; then
# if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly) # if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly)
# https://github.com/rabbitmq/rabbitmq-server/pull/1234 # https://github.com/rabbitmq/rabbitmq-server/pull/1234
: # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" rabbit_set_config 'total_memory_available_override_value' "$memLimitB"
# TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0)
fi fi
# https://www.rabbitmq.com/memory.html#memsup-usage # https://www.rabbitmq.com/memory.html#memsup-usage
if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then

3
3.7/docker-entrypoint.sh
View File

@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
if [ -n "$memLimitB" ]; then if [ -n "$memLimitB" ]; then
# if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly) # if we have a cgroup memory limit, let's inform RabbitMQ of what it is (so it can calculate vm_memory_high_watermark properly)
# https://github.com/rabbitmq/rabbitmq-server/pull/1234 # https://github.com/rabbitmq/rabbitmq-server/pull/1234
: # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" rabbit_set_config 'total_memory_available_override_value' "$memLimitB"
# TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0)
fi fi
# https://www.rabbitmq.com/memory.html#memsup-usage # https://www.rabbitmq.com/memory.html#memsup-usage
if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then