From 0f4c7e7aeee82a7c333a9776865450a3b374f2af Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 23 Sep 2021 09:29:28 +0000 Subject: [PATCH] Increase nova-cloud-controller RAM in func tests Recent test run(s) have shown memory exhaustion on the nova cloud controller units. This exhibits itself as the controller dropping messages from the compute nodes and logging messages like: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/oslo_service/threadgroup.py", line 268, in _perform_action_on_threads File "/usr/lib/python3/dist-packages/oslo_service/threadgroup.py", line 342, in lambda x: x.wait(), File "/usr/lib/python3/dist-packages/oslo_service/threadgroup.py", line 61, in wait return self.thread.wait() File "/usr/lib/python3/dist-packages/eventlet/greenthread.py", line 180, in wait return self._exit_event.wait() File "/usr/lib/python3/dist-packages/eventlet/event.py", line 125, in wait result = hub.switch() File "/usr/lib/python3/dist-packages/eventlet/hubs/hub.py", line 298, in switch return self.greenlet.switch() File "/usr/lib/python3/dist-packages/eventlet/hubs/hub.py", line 350, in run self.wait(sleep_time) File "/usr/lib/python3/dist-packages/eventlet/hubs/poll.py", line 80, in wait presult = self.do_poll(seconds) File "/usr/lib/python3/dist-packages/eventlet/hubs/epolls.py", line 31, in do_poll return self.poll.poll(seconds) MemoryError to the nova-conductor log. It seems very likely this issue is specific to Bionic Stein so it may be a little wasteful to have increased the memory allocation for all the bundles but I think consistancy between the bundles is more important. Change-Id: I2d45acadcd221786513c49256f087114a985e74f --- tests/bundles/bionic-queens.yaml | 3 ++- tests/bundles/bionic-rocky.yaml | 3 ++- tests/bundles/bionic-stein.yaml | 3 ++- tests/bundles/bionic-train.yaml | 3 ++- tests/bundles/bionic-ussuri.yaml | 3 ++- tests/bundles/focal-ussuri.yaml | 3 ++- tests/bundles/focal-victoria.yaml | 3 ++- tests/bundles/focal-wallaby.yaml | 3 ++- tests/bundles/groovy-victoria.yaml | 3 ++- tests/bundles/hirsute-wallaby.yaml | 3 ++- tests/bundles/trusty-mitaka.yaml | 3 ++- tests/bundles/xenial-mitaka.yaml | 3 ++- tests/bundles/xenial-ocata.yaml | 3 ++- tests/bundles/xenial-pike.yaml | 3 ++- tests/bundles/xenial-queens.yaml | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 2d6c40fc..725c5a17 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index d4f8f1f9..48bd95db 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 2bfe57d6..38e8e751 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 84dd23df..d4a469ae 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index ada15ed5..cd4b504f 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 8bdbac30..7905e719 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -15,7 +15,8 @@ machines: 5: {} 6: {} 7: {} - 8: {} + 8: + constraints: "mem=4G" 9: constraints: "root-disk=20G mem=4G" 10: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index e6f00955..016eea6d 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -15,7 +15,8 @@ machines: 5: {} 6: {} 7: {} - 8: {} + 8: + constraints: "mem=4G" 9: constraints: "root-disk=20G mem=4G" 10: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 56feece0..60e8dbc1 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -15,7 +15,8 @@ machines: 5: {} 6: {} 7: {} - 8: {} + 8: + constraints: "mem=4G" 9: constraints: "root-disk=20G mem=4G" 10: diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 1598b509..49a49cc1 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -15,7 +15,8 @@ machines: 5: {} 6: {} 7: {} - 8: {} + 8: + constraints: "mem=4G" 9: constraints: "root-disk=20G mem=4G" 10: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml index 0a5a95aa..ab09ddad 100644 --- a/tests/bundles/hirsute-wallaby.yaml +++ b/tests/bundles/hirsute-wallaby.yaml @@ -15,7 +15,8 @@ machines: 5: {} 6: {} 7: {} - 8: {} + 8: + constraints: "mem=4G" 9: constraints: "root-disk=20G mem=4G" 10: diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index e8d92eaa..5d3ac3cb 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index d0cdefd1..f001d1d3 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index c2616147..9073ff02 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 3d68818e..8103bc26 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index e32f7d26..7f236079 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -11,7 +11,8 @@ machines: 3: {} 4: {} 5: {} - 6: {} + 6: + constraints: "mem=4G" 7: constraints: "root-disk=20G mem=4G" 8: