From dc9451b8f990b9578327d14ee3c68556d2533c5f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Dec 2017 09:44:07 -0800 Subject: [PATCH] Add total_memory_available_override_value support in 3.7 --- 3.7/alpine/docker-entrypoint.sh | 3 +-- 3.7/debian/docker-entrypoint.sh | 3 +-- 3.7/docker-entrypoint.sh | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh index 9b749d7..cd806cb 100755 --- a/3.7/alpine/docker-entrypoint.sh +++ b/3.7/alpine/docker-entrypoint.sh @@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; 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) # https://github.com/rabbitmq/rabbitmq-server/pull/1234 - : # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" - # TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0) + rabbit_set_config 'total_memory_available_override_value' "$memLimitB" fi # https://www.rabbitmq.com/memory.html#memsup-usage if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then diff --git a/3.7/debian/docker-entrypoint.sh b/3.7/debian/docker-entrypoint.sh index bb5b3c3..99ae42b 100755 --- a/3.7/debian/docker-entrypoint.sh +++ b/3.7/debian/docker-entrypoint.sh @@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; 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) # https://github.com/rabbitmq/rabbitmq-server/pull/1234 - : # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" - # TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0) + rabbit_set_config 'total_memory_available_override_value' "$memLimitB" fi # https://www.rabbitmq.com/memory.html#memsup-usage if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then diff --git a/3.7/docker-entrypoint.sh b/3.7/docker-entrypoint.sh index bb5b3c3..99ae42b 100755 --- a/3.7/docker-entrypoint.sh +++ b/3.7/docker-entrypoint.sh @@ -285,8 +285,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; 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) # https://github.com/rabbitmq/rabbitmq-server/pull/1234 - : # TODO rabbit_set_config 'total_memory_available_override_value' "$memLimitB" - # TODO https://github.com/rabbitmq/rabbitmq-server/issues/1445 (missing in 3.7.0) + rabbit_set_config 'total_memory_available_override_value' "$memLimitB" fi # https://www.rabbitmq.com/memory.html#memsup-usage if [ "${RABBITMQ_VM_MEMORY_HIGH_WATERMARK:-}" ]; then