diff options
author | Luke Meyer <lmeyer@redhat.com> | 2017-05-23 15:46:59 -0400 |
---|---|---|
committer | Luke Meyer <lmeyer@redhat.com> | 2017-05-23 15:46:59 -0400 |
commit | da04b572777f43fc7a595e0960b66442c101cfce (patch) | |
tree | 38c3fbd49aa3a75fd33a1003a87fd23e25fce1b2 | |
parent | 323301a45b1adc20ea41b0633b53185a1a9d77e9 (diff) | |
download | openshift-da04b572777f43fc7a595e0960b66442c101cfce.tar.gz openshift-da04b572777f43fc7a595e0960b66442c101cfce.tar.bz2 openshift-da04b572777f43fc7a595e0960b66442c101cfce.tar.xz openshift-da04b572777f43fc7a595e0960b66442c101cfce.zip |
memory health check: adjust threshold for etcd
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/memory_availability.py | 2 | ||||
-rw-r--r-- | roles/openshift_health_checker/test/memory_availability_test.py | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/memory_availability.py b/roles/openshift_health_checker/openshift_checks/memory_availability.py index aed0e2d20..8b1a58ef4 100644 --- a/roles/openshift_health_checker/openshift_checks/memory_availability.py +++ b/roles/openshift_health_checker/openshift_checks/memory_availability.py @@ -13,7 +13,7 @@ class MemoryAvailability(OpenShiftCheck): recommended_memory_bytes = { "masters": 16 * 10**9, "nodes": 8 * 10**9, - "etcd": 20 * 10**9, + "etcd": 8 * 10**9, } @classmethod diff --git a/roles/openshift_health_checker/test/memory_availability_test.py b/roles/openshift_health_checker/test/memory_availability_test.py index 145169007..1db203854 100644 --- a/roles/openshift_health_checker/test/memory_availability_test.py +++ b/roles/openshift_health_checker/test/memory_availability_test.py @@ -39,7 +39,7 @@ def test_is_active(group_names, is_active): ( ['etcd'], 0, - 22200, + 8200, ), ( ['masters', 'nodes'], @@ -82,8 +82,14 @@ def test_succeeds_with_recommended_memory(group_names, configured_min, ansible_m ( ['etcd'], 0, - -1, - ['0.0 GB'], + 7000, + ['7.0 GB'], + ), + ( + ['etcd', 'masters'], + 0, + 9000, # enough memory for etcd, not enough for a master + ['9.0 GB'], ), ( ['nodes', 'masters'], |