From 440a566ff825f95d2d9cb558e11c4fbe7b9d2cb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Mon, 8 Jan 2018 16:41:42 +0100 Subject: [PATCH] containers: bump memory limit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit A default value of 4GB for MDS is more appropriate and 3GB for OSD also. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1531607 Signed-off-by: Sébastien Han (cherry picked from commit 97f520bc7488b8e09d4057783049c8975fbc336e) Signed-off-by: Sébastien Han --- group_vars/mdss.yml.sample | 2 +- group_vars/osds.yml.sample | 2 +- roles/ceph-mds/defaults/main.yml | 2 +- roles/ceph-osd/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/mdss.yml.sample b/group_vars/mdss.yml.sample index 3bfab9769..82ab1269b 100644 --- a/group_vars/mdss.yml.sample +++ b/group_vars/mdss.yml.sample @@ -27,7 +27,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_mds_docker_extra_env' variable. -#ceph_mds_docker_memory_limit: 1g +#ceph_mds_docker_memory_limit: 4g #ceph_mds_docker_cpu_limit: 1 # we currently for MDS_NAME to hostname because of a bug in ceph-docker diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample index 0c563eb0b..29385ef69 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -230,7 +230,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: 1g +#ceph_osd_docker_memory_limit: 3g #ceph_osd_docker_cpu_limit: 1 # PREPARE DEVICE diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml index b065bc7b6..8c62a666a 100644 --- a/roles/ceph-mds/defaults/main.yml +++ b/roles/ceph-mds/defaults/main.yml @@ -19,7 +19,7 @@ copy_admin_key: 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_mds_docker_extra_env' variable. -ceph_mds_docker_memory_limit: 1g +ceph_mds_docker_memory_limit: 4g ceph_mds_docker_cpu_limit: 1 # we currently for MDS_NAME to hostname because of a bug in ceph-docker diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml index 03169e061..ab0c95d65 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -222,7 +222,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: 1g +ceph_osd_docker_memory_limit: 3g ceph_osd_docker_cpu_limit: 1 # PREPARE DEVICE -- 2.39.5