Message ID | 20220708153503.18864-9-jsnow@redhat.com |
---|---|
State | New |
Headers | show |
Series | Improve reliability of VM tests | expand |
On 7/8/22 21:04, John Snow wrote: > If you try to run a 16 or 32 threaded test, you're going to run out of > memory very quickly with qom-test and a few others. Bump the memory > limit to try to scale with larger-core machines. > > Granted, this means that a 16 core processor is going to ask for 16GB, > but you*probably* meet that requirement if you have such a machine. > > 512MB per core didn't seem to be enough to avoid ENOMEM and SIGABRTs in > the test cases in practice on a six core machine; so I bumped it up to > 1GB which seemed to help. > > Add this magic in early to the configuration process so that the > config file, if provided, can still override it. > > Signed-off-by: John Snow<jsnow@redhat.com> > Reviewed-by: Daniel P. Berrangé<berrange@redhat.com> > --- > tests/vm/basevm.py | 5 +++++ > 1 file changed, 5 insertions(+) Acked-by: Richard Henderson <richard.henderson@linaro.org>
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7d0413df35..4fd9af10b7f 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -99,6 +99,11 @@ def __init__(self, args, config=None): self._source_path = args.source_path # Allow input config to override defaults. self._config = DEFAULT_CONFIG.copy() + + # 1GB per core, minimum of 4. This is only a default. + mem = max(4, args.jobs) + self._config['memory'] = f"{mem}G" + if config != None: self._config.update(config) self.validate_ssh_keys()