From c0b8edfea2641e0812a67a5bdb669182649073ef Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 9 Jul 2020 13:07:32 +0200 Subject: [PATCH] rgw: set container memory limit to 4g This commit changes the container memory limit for rgw daemons. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1707488 Signed-off-by: Guillaume Abrioux (cherry picked from commit 86edae724f98036ada845a138c7f586df395cd3a) --- group_vars/rgws.yml.sample | 2 +- roles/ceph-rgw/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample index a3ee9f18d..7728d35ae 100644 --- a/group_vars/rgws.yml.sample +++ b/group_vars/rgws.yml.sample @@ -84,7 +84,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_rgw_docker_extra_env' variable. -#ceph_rgw_docker_memory_limit: "{{ ansible_memtotal_mb }}m" +#ceph_rgw_docker_memory_limit: "4096m" #ceph_rgw_docker_cpu_limit: 8 #ceph_rgw_docker_cpuset_cpus: "0,2,4,6,8,10,12,14,16" #ceph_rgw_docker_cpuset_mems: "0" diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml index ce60be353..96ffd09c1 100644 --- a/roles/ceph-rgw/defaults/main.yml +++ b/roles/ceph-rgw/defaults/main.yml @@ -76,7 +76,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_rgw_docker_extra_env' variable. -ceph_rgw_docker_memory_limit: "{{ ansible_memtotal_mb }}m" +ceph_rgw_docker_memory_limit: "4096m" ceph_rgw_docker_cpu_limit: 8 #ceph_rgw_docker_cpuset_cpus: "0,2,4,6,8,10,12,14,16" #ceph_rgw_docker_cpuset_mems: "0" -- 2.39.5