Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
slapos.core
Commits
2d942896
Commit
2d942896
authored
May 22, 2017
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cgroup-cpuset work only inside itself
parent
c468bb45
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
17 deletions
+16
-17
slapos/format.py
slapos/format.py
+16
-17
No files found.
slapos/format.py
View file @
2d942896
...
@@ -486,7 +486,7 @@ class Computer(object):
...
@@ -486,7 +486,7 @@ class Computer(object):
return
pwd
.
getpwnam
(
self
.
software_user
)[
3
]
return
pwd
.
getpwnam
(
self
.
software_user
)[
3
]
def
_prepare_cgroup
s
_folder
(
self
,
folder
):
def
_prepare_cgroup_folder
(
self
,
folder
):
"""If-Create folder and set group write permission."""
"""If-Create folder and set group write permission."""
if
not
os
.
path
.
exists
(
folder
):
if
not
os
.
path
.
exists
(
folder
):
os
.
mkdir
(
folder
)
os
.
mkdir
(
folder
)
...
@@ -494,11 +494,15 @@ class Computer(object):
...
@@ -494,11 +494,15 @@ class Computer(object):
return
folder
return
folder
def
_prepare_cgroup
s_cpuset
(
self
,
base_path
,
group
):
def
_prepare_cgroup
_cpuset
(
self
):
"""Create cgroup
s
folder per-CPU with exclusive access to the CPU.
"""Create cgroup folder per-CPU with exclusive access to the CPU.
Those folders are "
``base_path``
/cpuset/cpu<N>".
Those folders are "
/sys/fs/cgroup
/cpuset/cpu<N>".
"""
"""
if
not
os
.
path
.
exists
(
"/sys/fs/cgroup/cpuset/cpuset.cpus"
):
self
.
logger
.
warining
(
"Cannot prepare CGROUP CPUSET - not supported by current OS"
)
return
with
open
(
"/sys/fs/cgroup/cpuset/cpuset.cpus"
,
"rt"
)
as
cpu_def
:
with
open
(
"/sys/fs/cgroup/cpuset/cpuset.cpus"
,
"rt"
)
as
cpu_def
:
# build up cpu_list of available CPU IDs
# build up cpu_list of available CPU IDs
cpu_list
=
[]
# types: list[int]
cpu_list
=
[]
# types: list[int]
...
@@ -506,33 +510,28 @@ class Computer(object):
...
@@ -506,33 +510,28 @@ class Computer(object):
# IDs can be in form "0-4" or "0,1,2,3,4"
# IDs can be in form "0-4" or "0,1,2,3,4"
if
"-"
in
cpu_def_split
:
if
"-"
in
cpu_def_split
:
a
,
b
=
map
(
int
,
cpu_def_split
.
split
(
"-"
))
a
,
b
=
map
(
int
,
cpu_def_split
.
split
(
"-"
))
cpu_list
.
extend
(
range
(
a
,
b
+
1
))
# because cgroup
s'
range is inclusive
cpu_list
.
extend
(
range
(
a
,
b
+
1
))
# because cgroup
's
range is inclusive
continue
continue
cpu_list
.
append
(
int
(
cpu_def_split
))
cpu_list
.
append
(
int
(
cpu_def_split
))
# For every CPU ID create an exclusive cgroup
# For every CPU ID create an exclusive cgroup
for
cpu
in
cpu_list
:
for
cpu
in
cpu_list
:
cpu_path
=
self
.
_prepare_cgroup
s
_folder
(
cpu_path
=
self
.
_prepare_cgroup_folder
(
os
.
path
.
join
(
base_path
,
"cpu"
+
str
(
cpu
)))
os
.
path
.
join
(
"/sys/fs/cgroup/cpuset/"
,
"cpu"
+
str
(
cpu
)))
with
open
(
cpu_path
+
"/cpuset.cpus"
,
"wt"
)
as
fx
:
with
open
(
cpu_path
+
"/cpuset.cpus"
,
"wt"
)
as
fx
:
fx
.
write
(
str
(
cpu
))
# this cgroup manages only this cpu
fx
.
write
(
str
(
cpu
))
# this cgroup manages only this cpu
with
open
(
cpu_path
+
"/cpuset.cpu_exclusive"
,
"wt"
)
as
fx
:
with
open
(
cpu_path
+
"/cpuset.cpu_exclusive"
,
"wt"
)
as
fx
:
fx
.
write
(
"1"
)
# manages it exclusively
fx
.
write
(
"1"
)
# manages it exclusively
os
.
chown
(
cpu_path
+
"/tasks"
,
-
1
,
self
.
software_gid
)
os
.
chown
(
cpu_path
+
"/tasks"
,
-
1
,
self
.
software_gid
)
def
_prepare_cgroups
(
self
):
"""Build CGROUPS tree exclusively for slapos.
def
prepare_cgroup
(
self
):
"""Build CGROUP tree exclusively for slapos.
- Create hierarchy of CPU sets so that every partition can have exclusive
- Create hierarchy of CPU sets so that every partition can have exclusive
hold of one of the CPUs.
hold of one of the CPUs.
"""
"""
base_path
=
self
.
_prepare_cgroups_folder
(
"/sys/fs/cgroup/slapos"
)
self
.
_prepare_cgroup_cpuset
()
# If cgroups-cpuset is present create exclusive cpusets "cpuN" per CPU
if
os
.
path
.
exists
(
"/sys/fs/cgroup/cpuset/cpuset.cpus"
):
self
.
_prepare_cgroups_cpuset
(
self
.
_prepare_cgroups_folder
(
os
.
path
.
join
(
base_path
,
"cpuset"
)))
def
construct
(
self
,
alter_user
=
True
,
alter_network
=
True
,
create_tap
=
True
,
use_unique_local_address_block
=
False
):
def
construct
(
self
,
alter_user
=
True
,
alter_network
=
True
,
create_tap
=
True
,
use_unique_local_address_block
=
False
):
...
@@ -565,7 +564,7 @@ class Computer(object):
...
@@ -565,7 +564,7 @@ class Computer(object):
os
.
chmod
(
self
.
software_root
,
0o755
)
os
.
chmod
(
self
.
software_root
,
0o755
)
# Build own CGROUPS tree for resource control
# Build own CGROUPS tree for resource control
self
.
_prepare_cgroups
()
self
.
prepare_cgroup
()
# get list of instance external storage if exist
# get list of instance external storage if exist
instance_external_list
=
[]
instance_external_list
=
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment