summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr Mogylchenko <amogylchenko@mirantis.com>2017-03-01 16:58:59 +0100
committerAleksandr Mogylchenko <amogylchenko@mirantis.com>2017-03-01 18:08:23 +0100
commit0d02edf6327c9bd0bb2a9b02897c12a546264277 (patch)
treedc84e3957b13303f0603a51df9f56d3ab73c99dc
parentc524d3d310e2f3f0c7fbe1b8030a4c0b72eac398 (diff)
Render vm_memory_high_watermark for RabbitMQ
RabbitMQ/Erlang do not properly determine available RAM when running in containerised environment, plus default value for watermark is 0.4, which is low for nodes running RabbitMQ only. Some additional information: https://www.rabbitmq.com/memory.html Change-Id: I1738c66be0e698568881b2c64d5d456db851af4d Depends-On: Iadd0529d166ef1dad1697215bbc181104a7b926e Depends-On: Ibc6e8b91055f411b058505d14c2d83fbc826cdd4
Notes
Notes (review): Code-Review+2: Andrey Pavlov <apavlov@mirantis.com> Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Sergey Lukjanov <slukjanov@mirantis.com> Workflow+1: Sergey Lukjanov <slukjanov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 01 Mar 2017 20:47:43 +0000 Reviewed-on: https://review.openstack.org/439678 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--service/files/defaults.yaml1
-rw-r--r--service/files/rabbitmq.config.j21
2 files changed, 2 insertions, 0 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 74261c6..fc66527 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -18,6 +18,7 @@ configs:
18 # How many seconds we give a node before making liveness checks 18 # How many seconds we give a node before making liveness checks
19 # completely strict 19 # completely strict
20 node_startup_timeout: 180 20 node_startup_timeout: 180
21 high_watermark_ratio: 0.75
21 22
22url: 23url:
23 rabbitmq: 24 rabbitmq:
diff --git a/service/files/rabbitmq.config.j2 b/service/files/rabbitmq.config.j2
index 5e7302a..936e0ec 100644
--- a/service/files/rabbitmq.config.j2
+++ b/service/files/rabbitmq.config.j2
@@ -23,6 +23,7 @@
23 {verify,verify_peer}, 23 {verify,verify_peer},
24 {fail_if_no_peer_cert,false}]} 24 {fail_if_no_peer_cert,false}]}
25 {% endif %} 25 {% endif %}
26 ,{vm_memory_high_watermark, {absolute, {{ (memory_limit|int * rabbitmq.high_watermark_ratio)|int }}}}
26 ]} 27 ]}
27 ,{autocluster, [ 28 ,{autocluster, [
28 {dummy_param_without_comma, true} 29 {dummy_param_without_comma, true}