Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
c4451a1f
Commit
c4451a1f
authored
9 years ago
by
Morris Jette
Browse files
Options
Downloads
Patches
Plain Diff
Cosmetic changes, no logic changes
parent
ae323e27
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/task/cgroup/task_cgroup_memory.c
+3
-3
3 additions, 3 deletions
src/plugins/task/cgroup/task_cgroup_memory.c
src/slurmd/common/xcgroup.c
+1
-1
1 addition, 1 deletion
src/slurmd/common/xcgroup.c
with
4 additions
and
4 deletions
src/plugins/task/cgroup/task_cgroup_memory.c
+
3
−
3
View file @
c4451a1f
...
...
@@ -383,7 +383,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
* a task. The release_agent will have to lock the root memory cgroup
* to avoid this scenario.
*/
if
(
xcgroup_create
(
&
memory_ns
,
&
memory_cg
,
""
,
0
,
0
)
!=
XCGROUP_SUCCESS
)
{
if
(
xcgroup_create
(
&
memory_ns
,
&
memory_cg
,
""
,
0
,
0
)
!=
XCGROUP_SUCCESS
)
{
error
(
"task/cgroup: unable to create root memory xcgroup"
);
return
SLURM_ERROR
;
}
...
...
@@ -403,7 +403,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
* are not working well so it will be really difficult to manage
* addition/removal of memory amounts at this level. (kernel 2.6.34)
*/
if
(
xcgroup_create
(
&
memory_ns
,
&
user_memory_cg
,
if
(
xcgroup_create
(
&
memory_ns
,
&
user_memory_cg
,
user_cgroup_path
,
getuid
(),
getgid
())
!=
XCGROUP_SUCCESS
)
{
goto
error
;
...
...
@@ -412,7 +412,7 @@ extern int task_cgroup_memory_create(stepd_step_rec_t *job)
xcgroup_destroy
(
&
user_memory_cg
);
goto
error
;
}
if
(
xcgroup_set_param
(
&
user_memory_cg
,
"memory.use_hierarchy"
,
"1"
)
if
(
xcgroup_set_param
(
&
user_memory_cg
,
"memory.use_hierarchy"
,
"1"
)
!=
XCGROUP_SUCCESS
)
{
error
(
"task/cgroup: unable to ask for hierarchical accounting"
"of user memcg '%s'"
,
user_memory_cg
.
path
);
...
...
This diff is collapsed.
Click to expand it.
src/slurmd/common/xcgroup.c
+
1
−
1
View file @
c4451a1f
...
...
@@ -466,7 +466,7 @@ int xcgroup_instanciate(xcgroup_t* cg)
file_path
=
cg
->
path
;
uid
=
cg
->
uid
;
gid
=
cg
->
gid
;
create_only
=
0
;
create_only
=
0
;
notify
=
cg
->
notify
;
/* save current mask and apply working one */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment