From 60c06a7afe5e22d5230c123da24ec55ddaf999a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 15 Jun 2018 15:39:34 -0400 Subject: [PATCH] mon/osd: bump container memory limit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As discussed with the cores, the current limits are too low and should be bumped to higher value. So now by default monitors get 3GB and OSDs get 5GB. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1591876 Signed-off-by: Sébastien Han (cherry picked from commit a9ed3579ae680949b4f53aee94003ca50d1ae721) Signed-off-by: Sébastien Han --- group_vars/mons.yml.sample | 2 +- group_vars/osds.yml.sample | 2 +- roles/ceph-mon/defaults/main.yml | 2 +- roles/ceph-osd/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample index d65547739..1fea4bf70 100644 --- a/group_vars/mons.yml.sample +++ b/group_vars/mons.yml.sample @@ -77,7 +77,7 @@ dummy: # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations # These options can be passed using the 'ceph_mon_docker_extra_env' variable. -#ceph_mon_docker_memory_limit: 1g +#ceph_mon_docker_memory_limit: 3g #ceph_mon_docker_cpu_limit: 1 # Use this variable to add extra env configuration to run your mon container. diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample index d3ea98c7d..a00918811 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -237,7 +237,7 @@ dummy: # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations # These options can be passed using the 'ceph_osd_docker_extra_env' variable. -#ceph_osd_docker_memory_limit: 3g +#ceph_osd_docker_memory_limit: 5g #ceph_osd_docker_cpu_limit: 1 # The next two variables are undefined, and thus, unused by default. diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index 09183253f..513f21d28 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -69,7 +69,7 @@ create_crush_tree: false # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations # These options can be passed using the 'ceph_mon_docker_extra_env' variable. -ceph_mon_docker_memory_limit: 1g +ceph_mon_docker_memory_limit: 3g ceph_mon_docker_cpu_limit: 1 # Use this variable to add extra env configuration to run your mon container. diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 1b63433e7..c33d5447f 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -229,7 +229,7 @@ ceph_config_keys: [] # DON'T TOUCH ME # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations # These options can be passed using the 'ceph_osd_docker_extra_env' variable. -ceph_osd_docker_memory_limit: 3g +ceph_osd_docker_memory_limit: 5g ceph_osd_docker_cpu_limit: 1 # The next two variables are undefined, and thus, unused by default.