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
Ivan Tyagov
slapos.core
Commits
6b6d7306
Commit
6b6d7306
authored
Jan 12, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use profile to log promises resource consumption
parent
c49161fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+1
-1
slapos/grid/utils.py
slapos/grid/utils.py
+22
-5
No files found.
slapos/grid/slapgrid.py
View file @
6b6d7306
...
...
@@ -630,7 +630,7 @@ stderr_logfile_backups=1
promise_dir
=
os
.
path
.
join
(
instance_path
,
'etc'
,
'promise'
)
if
not
checkPromiseList
(
promise_dir
,
self
.
promise_timeout
,
uid
=
uid
,
gid
=
gid
,
cwd
=
instance_path
,
logger
=
self
.
logger
,
profile
=
Tru
e
,
cwd
=
instance_path
,
logger
=
self
.
logger
,
profile
=
Fals
e
,
raise_on_failure
=
True
):
self
.
logger
.
info
(
"No promise."
)
...
...
slapos/grid/utils.py
View file @
6b6d7306
...
...
@@ -38,6 +38,7 @@ import subprocess
import
sys
import
logging
import
time
import
psutil
from
datetime
import
datetime
from
slapos.grid.exception
import
BuildoutFailedError
,
WrongPermissionError
...
...
@@ -370,7 +371,7 @@ def checkPromiseList(promise_dir, promise_timeout, uid=None, gid=None, cwd=None,
"""
Check a promise list and return the result or raise in case of failure
if `raise_on_failure` is set to True
When `profile` is set to True, log each promise
execution duration
.
When `profile` is set to True, log each promise
resource usage
.
"""
if
logger
is
None
:
logging
.
basicConfig
(
format
=
"%(asctime)s - %(levelname)s - %(message)s"
)
...
...
@@ -415,9 +416,27 @@ def checkPromiseList(promise_dir, promise_timeout, uid=None, gid=None, cwd=None,
# Check if the promise finished every tenth of second,
# but timeout after promise_timeout.
sleep_time
=
0.1
check_profile
=
False
if
profile
:
try
:
psutil_process
=
psutil
.
Process
(
process_handler
.
pid
)
check_profile
=
True
except
psutil
.
NoSuchProcess
:
# process is gone
pass
increment_limit
=
int
(
promise_timeout
/
sleep_time
)
for
current_increment
in
range
(
0
,
increment_limit
):
if
process_handler
.
poll
()
is
None
:
if
check_profile
:
logger
.
debug
(
"CPU: %s%%, MEMORY: %s MB (%s%%), DISK: %s Read - %s Write"
%
(
psutil_process
.
cpu_percent
(),
psutil_process
.
memory_info
().
rss
/
float
(
2
**
20
),
round
(
psutil_process
.
memory_percent
(),
4
),
psutil_process
.
io_counters
().
read_count
,
psutil_process
.
io_counters
().
write_count
)
)
time
.
sleep
(
sleep_time
)
continue
result_dict
[
"execution-time"
]
=
current_increment
*
sleep_time
...
...
@@ -450,9 +469,7 @@ def checkPromiseList(promise_dir, promise_timeout, uid=None, gid=None, cwd=None,
result_dict
[
"execution-time"
]
=
current_increment
*
sleep_time
promise_result_list
.
append
(
result_dict
)
if
profile
:
logger
.
info
(
"Finished promise %r in %s second(s)."
%
(
promise
,
result_dict
[
"execution-time"
]))
logger
.
info
(
"Finished promise %r in %s second(s)."
%
(
promise
,
result_dict
[
"execution-time"
]))
return
promise_result_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