From df7f669123d1e8c28b9f955748dae10bb8bcceb7 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sat, 15 Jun 2019 15:11:39 +0200 Subject: [PATCH 1/2] Fix MemoryOverconsumptionCheck message check --- cscs-checks/system/slurm/slurm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index c53d2c1b24..6c8450811f 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -156,8 +156,7 @@ def __init__(self): self.sourcepath = 'eatmemory.c' self.tags.add('mem') self.executable_opts = ['4000M'] - self.sanity_patterns = sn.assert_found(r'exceeded memory limit', - self.stderr) + self.sanity_patterns = sn.assert_found(r'Out Of Memory', self.stderr) def setup(self, partition, environ, **job_opts): super().setup(partition, environ, **job_opts) From 161aff25b64fd5db7568cd54cd217c7063b81705 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Mon, 17 Jun 2019 14:22:37 +0200 Subject: [PATCH 2/2] Support also the "old" OOM message in Slurm check - Nothing obvious seems to have been changed inside Slurm regarding the OOM handling. It could be that the different paths are triggered by some system change, so support both the old and the new message. --- cscs-checks/system/slurm/slurm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cscs-checks/system/slurm/slurm.py b/cscs-checks/system/slurm/slurm.py index 6c8450811f..5896b5f23c 100644 --- a/cscs-checks/system/slurm/slurm.py +++ b/cscs-checks/system/slurm/slurm.py @@ -156,7 +156,9 @@ def __init__(self): self.sourcepath = 'eatmemory.c' self.tags.add('mem') self.executable_opts = ['4000M'] - self.sanity_patterns = sn.assert_found(r'Out Of Memory', self.stderr) + self.sanity_patterns = sn.assert_found( + r'(exceeded memory limit)|(Out Of Memory)', self.stderr + ) def setup(self, partition, environ, **job_opts): super().setup(partition, environ, **job_opts)