github/nohang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix psi2log output

Browse Source
This commit is contained in:
Alexey Avramov 2020-06-14 08:52:09 +09:00
parent e1b0c8add0
commit 731aa6820c
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/psi2log
View File

@ -143,13 +143,18 @@ def mlockall():
MCL_CURRENT = 1 MCL_CURRENT = 1
MCL_FUTURE = 2 MCL_FUTURE = 2
MCL_ONFAULT = 4 MCL_ONFAULT = 4
libc = CDLL('libc.so.6', use_errno=True) libc = CDLL('libc.so.6', use_errno=True)
result = libc.mlockall(MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT) result = libc.mlockall(MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT)
if result != 0: if result != 0:
result = libc.mlockall(MCL_CURRENT | MCL_FUTURE) result = libc.mlockall(MCL_CURRENT | MCL_FUTURE)
if result != 0: if result != 0:
log_head('WARNING: cannot lock all memory: [Errno {}]'.format( log('WARNING: cannot lock all memory: [Errno {}]'.format(result))
result)) else:
log('All memory locked with MCL_CURRENT | MCL_FUTURE')
else:
log('All memory locked with MCL_CURRENT | MCL_FUTURE | MCL_ONFAULT')
def psi_file_mem_to_metrics0(psi_path): def psi_file_mem_to_metrics0(psi_path):
@ -412,9 +417,22 @@ else:
logstring = 'log file is not set, ' logstring = 'log file is not set, '
if interval < 0.1: if interval < 1:
log_head('error: argument -i/--interval: the value must be greater than or' log_head('error: argument -i/--interval: the value must be greater than or'
' equal to 0.1') ' equal to 1')
exit(1)
if not (mode == '1' or mode == '2'):
log_head('ERROR: invalid mode. Valid values are 1 and 2. Exit.')
exit(1)
try:
psi_file_mem_to_metrics0('/proc/pressure/memory')
except Exception as e:
log_head('ERROR: {}'.format(e))
log_head('PSI metrics are not provided by the kernel. Exit.')
exit(1) exit(1)
@ -426,14 +444,6 @@ log_head('Starting psi2log, target: {}, mode: {}, interval: {} sec, {}suppress'
fd = dict() fd = dict()
try:
psi_file_mem_to_metrics0('/proc/pressure/memory')
except Exception as e:
log('ERROR: {}'.format(e))
log('PSI metrics are not provided by the kernel. Exit.')
exit(1)
if target == 'SYSTEM_WIDE': if target == 'SYSTEM_WIDE':
system_wide = True system_wide = True
source_dir = '/proc/pressure' source_dir = '/proc/pressure'
@ -495,7 +505,7 @@ if mode == '2':
monotonic1 = monotonic() monotonic1 = monotonic()
dm = monotonic1 - monotonic0 dm = monotonic1 - monotonic0
if dm > abnormal_interval: if dm > abnormal_interval and dm - interval > 0.05:
log('WARNING: abnormal interval ({} sec), metrics may be prov' log('WARNING: abnormal interval ({} sec), metrics may be prov'
'ided incorrect'.format(round(dm, 3))) 'ided incorrect'.format(round(dm, 3)))
@ -546,7 +556,7 @@ if mode == '2':
round(avg_ms, 1), round(avg_ms, 1),
round(avg_mf, 1), round(avg_mf, 1),
round(dm, 2) round(dm, 3)
)) ))
@ -554,11 +564,6 @@ if mode == '2':
sleep(interval) sleep(interval)
if mode != '1':
log('ERROR: invalid mode. Exit.')
exit(1)
print_head_1() print_head_1()