roles: do not limit docker_memory_limit for various daemons

Since we do not have enough data to put valid upper bounds for the memory
usage of these daemons, do not put artificial limits by default. This will
help us avoid failures like OOM kills due to low default values.

Whenever required, these limits can be manually enforced by the user.

More details in
https://bugzilla.redhat.com/show_bug.cgi?id=1638148

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1638148
Signed-off-by: Neha Ojha <nojha@redhat.com>

diff --git a/group_vars/iscsigws.yml.sample b/group_vars/iscsigws.yml.sample
index fbed716f197a64d938e005300ff47906c1b11d67..ce92bdfdbce5044835d1602afb59f9c3985ac471 100644 (file)
--- a/group_vars/iscsigws.yml.sample
+++ b/group_vars/iscsigws.yml.sample
@@ -88,14 +88,14 @@ dummy:
 # These options can be passed using the 'ceph_mds_docker_extra_env' variable.
 
 # TCMU_RUNNER resource limitation
-#ceph_tcmu_runner_docker_memory_limit: 1g
+#ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_tcmu_runner_docker_cpu_limit: 1
 
 # RBD_TARGET_GW resource limitation
-#ceph_rbd_target_gw_docker_memory_limit: 1g
+#ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_rbd_target_gw_docker_cpu_limit: 1
 
 # RBD_TARGET_API resource limitation
-#ceph_rbd_target_api_docker_memory_limit: 1g
+#ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_rbd_target_api_docker_cpu_limit: 1
 

diff --git a/group_vars/mdss.yml.sample b/group_vars/mdss.yml.sample
index 82ab1269b3dd3af43a060ce2680b302c03d08ddd..61fd577f2ac31ba8d2cc21939263f0d79e3692ab 100644 (file)
--- 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: 4g
+#ceph_mds_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #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/mgrs.yml.sample b/group_vars/mgrs.yml.sample
index 2966c1b5e63287413dd44224cdfe479505490ab0..38bf2ea5dd7edb64b56dce8c37c2e4ac7f6c5010 100644 (file)
--- a/group_vars/mgrs.yml.sample
+++ b/group_vars/mgrs.yml.sample
@@ -32,7 +32,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_mgr_docker_extra_env' variable.
-#ceph_mgr_docker_memory_limit: 1g
+#ceph_mgr_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_mgr_docker_cpu_limit: 1
 
 #ceph_mgr_docker_extra_env:

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index b1ab316f2746c2bee76e91bed71cd8532aa1c77f..11a604a5ab0a8d876c1e94a9decda3c34c73459b 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -72,7 +72,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: 3g
+#ceph_mon_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #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 5e880283102eb38d24956cd659ecff326ffb9794..d0a7359af28ac6820a767430ce6438ac5225e5ad 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -233,7 +233,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: 5g
+#ceph_osd_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_osd_docker_cpu_limit: 1
 
 # The next two variables are undefined, and thus, unused by default.

diff --git a/group_vars/rbdmirrors.yml.sample b/group_vars/rbdmirrors.yml.sample
index b680b054c957b8279789bd8505b63e950bde4390..3f42490bd8bac5eb2eecfa398767e1bf9dd5538b 100644 (file)
--- a/group_vars/rbdmirrors.yml.sample
+++ b/group_vars/rbdmirrors.yml.sample
@@ -51,7 +51,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_rbd_mirror_docker_extra_env' variable.
-#ceph_rbd_mirror_docker_memory_limit: 1g
+#ceph_rbd_mirror_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_rbd_mirror_docker_cpu_limit: 1
 
 #ceph_rbd_mirror_docker_extra_env:

diff --git a/group_vars/rgws.yml.sample b/group_vars/rgws.yml.sample
index e8cc1c76807ba0237a1b8566b572f41027810e1e..e49478b67222a936c984162979f1727611ed06ef 100644 (file)
--- a/group_vars/rgws.yml.sample
+++ b/group_vars/rgws.yml.sample
@@ -62,7 +62,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: 1g
+#ceph_rgw_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 #ceph_rgw_docker_cpu_limit: 1
 
 #ceph_rgw_docker_extra_env:

diff --git a/roles/ceph-iscsi-gw/defaults/main.yml b/roles/ceph-iscsi-gw/defaults/main.yml
index 5f8b8a703af9858333b576e2c5e6ae045de76cfe..cf24a9033c598b604d05488104b118d045d63f5a 100644 (file)
--- a/roles/ceph-iscsi-gw/defaults/main.yml
+++ b/roles/ceph-iscsi-gw/defaults/main.yml
@@ -80,13 +80,13 @@ trusted_ip_list: 192.168.122.1
 # These options can be passed using the 'ceph_mds_docker_extra_env' variable.
 
 # TCMU_RUNNER resource limitation
-ceph_tcmu_runner_docker_memory_limit: 1g
+ceph_tcmu_runner_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_tcmu_runner_docker_cpu_limit: 1
 
 # RBD_TARGET_GW resource limitation
-ceph_rbd_target_gw_docker_memory_limit: 1g
+ceph_rbd_target_gw_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_rbd_target_gw_docker_cpu_limit: 1
 
 # RBD_TARGET_API resource limitation
-ceph_rbd_target_api_docker_memory_limit: 1g
+ceph_rbd_target_api_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_rbd_target_api_docker_cpu_limit: 1

diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml
index 8c62a666aae7c59ba99b66d99f33d251ef1ef1c4..a6d7f75a11db713af82a6bc6860ee0de5f89aaeb 100644 (file)
--- 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: 4g
+ceph_mds_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 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-mgr/defaults/main.yml b/roles/ceph-mgr/defaults/main.yml
index 9214f50010d1a3e73cee0ed87ac349e284f9250a..fffb56cf6cfa73dfa1e1c4ecd51c6f357abf49f4 100644 (file)
--- a/roles/ceph-mgr/defaults/main.yml
+++ b/roles/ceph-mgr/defaults/main.yml
@@ -24,7 +24,7 @@ ceph_mgr_modules: [status]
 # 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_mgr_docker_extra_env' variable.
-ceph_mgr_docker_memory_limit: 1g
+ceph_mgr_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_mgr_docker_cpu_limit: 1
 
 ceph_mgr_docker_extra_env:

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 8b19c9bdb2fd96746c6cfb08246983b8fcd00b37..52732ec3190ca0292c07144012335a02687ca489 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -64,7 +64,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: 3g
+ceph_mon_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 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 8bb36e496c70fe4635a552e6bb661f99d2d3c087..800a0a96f2260d3ad33ecdb2448eedc2c0f53949 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -225,7 +225,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: 5g
+ceph_osd_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_osd_docker_cpu_limit: 1
 
 # The next two variables are undefined, and thus, unused by default.

diff --git a/roles/ceph-rbd-mirror/defaults/main.yml b/roles/ceph-rbd-mirror/defaults/main.yml
index 4c1ecb7d5e46208a67007508a45d8e5d5490af35..acb3b8f927d1c8186264e8624e1e46f29812a9e2 100644 (file)
--- a/roles/ceph-rbd-mirror/defaults/main.yml
+++ b/roles/ceph-rbd-mirror/defaults/main.yml
@@ -43,7 +43,7 @@ ceph_rbd_mirror_remote_user: ""
 # 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_rbd_mirror_docker_extra_env' variable.
-ceph_rbd_mirror_docker_memory_limit: 1g
+ceph_rbd_mirror_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_rbd_mirror_docker_cpu_limit: 1
 
 ceph_rbd_mirror_docker_extra_env:

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index 1e108be4457bb03a3ac07d730d7b1640133870ff..339a554e75d493199ab76cd61e5f41d82c63942c 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -54,7 +54,7 @@ rgw_pull_proto: "http"
 # 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: 1g
+ceph_rgw_docker_memory_limit: "{{ ansible_memtotal_mb }}"
 ceph_rgw_docker_cpu_limit: 1
 
 ceph_rgw_docker_extra_env: