From da04b572777f43fc7a595e0960b66442c101cfce Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Tue, 23 May 2017 15:46:59 -0400 Subject: memory health check: adjust threshold for etcd --- .../openshift_checks/memory_availability.py | 2 +- .../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'], -- cgit v1.2.3