Skip to content

Commit

Permalink
Partially modify the commit 971d002.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbigagli committed Jun 4, 2015
1 parent 0597691 commit 707268a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions NEWS
Expand Up @@ -26,6 +26,9 @@ documents those changes that are of interest to users and administrators.
-- switch/cray: Refine logic to set PMI_CRAY_NO_SMP_ENV environment variable.
-- When sacctmgr loads archives with version less than 14.11 set the array
task id to NO_VAL, so sacct can display the job ids correctly.
-- When using memory cgroup if a task uses more memory than requested
the failures are logged into memory.failcnt count file by cgroup
and the user is notified by slurmstepd about it.

* Changes in Slurm 14.11.7
==========================
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/task/cgroup/task_cgroup_memory.c
Expand Up @@ -501,20 +501,20 @@ extern int task_cgroup_memory_check_oom(stepd_step_rec_t *job)
* reached the value set in
* memory.memsw.limit_in_bytes.
*/
info("Exceeded step memory limit at some point.");
error("Exceeded step memory limit at some point.");
else if (failcnt_non_zero(&step_memory_cg,
"memory.failcnt"))
/* reports the number of times that the
* memory limit has reached the value set
* in memory.limit_in_bytes.
*/
info("Exceeded step memory limit at some point.");
error("Exceeded step memory limit at some point.");
if (failcnt_non_zero(&job_memory_cg,
"memory.memsw.failcnt"))
info("Exceeded job memory limit at some point.");
error("Exceeded job memory limit at some point.");
else if (failcnt_non_zero(&job_memory_cg,
"memory.failcnt"))
info("Exceeded job memory limit at some point.");
error("Exceeded job memory limit at some point.");
xcgroup_unlock(&memory_cg);
} else
error("task/cgroup task_cgroup_memory_check_oom: "
Expand Down

0 comments on commit 707268a

Please sign in to comment.