From 84a55f34f59e2718d55417e353744e252dd8e610 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 7 Nov 2013 16:13:42 -0800
Subject: [PATCH] Fixed long lines
---
src/plugins/task/cgroup/task_cgroup_memory.c | 29 ++++++++++++++------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/plugins/task/cgroup/task_cgroup_memory.c b/src/plugins/task/cgroup/task_cgroup_memory.c
index 3b5ba8d27bb..8da45b0cbfb 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.c
+++ b/src/plugins/task/cgroup/task_cgroup_memory.c
@@ -457,19 +457,32 @@ extern int task_cgroup_memory_check_oom(slurmd_job_t *job) {
if (xcgroup_create(&memory_ns,&memory_cg,"",0,0) == XCGROUP_SUCCESS) {
if (xcgroup_lock(&memory_cg) == XCGROUP_SUCCESS) {
- /* for some reason the job cgroup limit is hit for a step and vice versa...
- * can't tell which is which so we'll treat them the same */
- xcgroup_get_uint64_param(&step_memory_cg, "memory.memsw.failcnt", &memory_memsw_failcnt);
+ /* for some reason the job cgroup limit is hit
+ * for a step and vice versa...
+ * can't tell which is which so we'll treat
+ * them the same */
+ xcgroup_get_uint64_param(&step_memory_cg,
+ "memory.memsw.failcnt",
+ &memory_memsw_failcnt);
if(memory_memsw_failcnt > 0)
- error("Exceeded job memory limit at some point. oom-killer likely killed a process.");
- xcgroup_get_uint64_param(&job_memory_cg, "memory.memsw.failcnt", &memory_memsw_failcnt);
+ error("Exceeded step memory limit at some "
+ "point. oom-killer likely "
+ "killed a process.");
+ xcgroup_get_uint64_param(&job_memory_cg,
+ "memory.memsw.failcnt",
+ &memory_memsw_failcnt);
if(memory_memsw_failcnt > 0)
- error("Exceeded job memory limit at some point. oom-killer likely killed a process.");
+ error("Exceeded job memory limit at some "
+ "point. oom-killer likely "
+ "killed a process.");
xcgroup_unlock(&memory_cg);
} else
- error("task/cgroup task_cgroup_memory_check_oom: task_cgroup_memory_check_oom: unable to lock root memcg : %m");
+ error("task/cgroup task_cgroup_memory_check_oom: "
+ "task_cgroup_memory_check_oom: unable to lock "
+ "root memcg : %m");
xcgroup_destroy(&memory_cg);
} else
- error("task/cgroup task_cgroup_memory_check_oom: unable to create root memcg : %m");
+ error("task/cgroup task_cgroup_memory_check_oom: "
+ "unable to create root memcg : %m");
return SLURM_SUCCESS;
}
--
GitLab