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

fix

Browse Source
This commit is contained in:
Alexey Avramov 2019-04-03 14:09:06 +09:00
parent f1128f5c8f
commit d8d0388b93
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nohang
View File

@ -486,7 +486,7 @@ def rline1(path):
# print('UDE rline1', path) # print('UDE rline1', path)
with open(path, 'rb') as f: with open(path, 'rb') as f:
return f.read(999).decode( return f.read(999).decode(
'utf-8', 'ignore').split('\n')[0] 'utf-8', 'ignore').split('\n')[0] ## use partition()!
def kib_to_mib(num): def kib_to_mib(num):
@ -713,7 +713,7 @@ def send_notify(signal, name, pid):
# wait for memory release after corrective action # wait for memory release after corrective action
# may be useful if free memory was about 0 immediately after # may be useful if free memory was about 0 immediately after
# corrective action # corrective action
sleep(0.01) sleep(0.05)
title = 'Freeze prevention' title = 'Freeze prevention'
body = '<b>{}</b> [{}] <b>{}</b>'.format( body = '<b>{}</b> [{}] <b>{}</b>'.format(
@ -1237,11 +1237,14 @@ def implement_corrective_action(signal):
# todo: make new func # todo: make new func
m = check_mem_and_swap() m = check_mem_and_swap()
ma = round(int(m[0]) / 1024.0, 1) ma = int(m[0]) / 1024.0
sf = round(int(m[2]) / 1024.0, 1) sf = int(m[2]) / 1024.0
log('Memory status before implementing a corrective act' log('Memory status before implementing a corrective act'
'ion:\n MemAvailable' 'ion:\n MemAvailable'
': {} MiB, SwapFree: {} MiB'.format(ma, sf)) ': {} MiB, SwapFree: {} MiB'.format(
round(ma, 1), round(sf, 1)
)
)
cmd = etc_dict[name].replace('$PID', pid).replace( cmd = etc_dict[name].replace('$PID', pid).replace(
'$NAME', pid_to_name(pid)) '$NAME', pid_to_name(pid))
@ -1279,11 +1282,14 @@ def implement_corrective_action(signal):
try: try:
m = check_mem_and_swap() m = check_mem_and_swap()
ma = round(int(m[0]) / 1024.0) ma = int(m[0]) / 1024.0
sf = round(int(m[2]) / 1024.0) sf = int(m[2]) / 1024.0
log('Memory status before implementing a correct' log('Memory status before implementing a corrective act'
'ive action:\n MemAvailable' 'ion:\n MemAvailable'
': {} MiB, SwapFree: {} MiB'.format(ma, sf)) ': {} MiB, SwapFree: {} MiB'.format(
round(ma, 1), round(sf, 1)
)
)
os.kill(int(pid), signal) os.kill(int(pid), signal)
response_time = time() - time0 response_time = time() - time0

2
nohang_notify_helper
View File

@ -48,7 +48,7 @@ with open('/proc/meminfo') as f:
if swap_total > 0: if swap_total > 0:
wait_time = 5 wait_time = 5
else: else:
wait_time = 0.5 wait_time = 1
print('nohang_notify_helper: wait_time:', wait_time) print('nohang_notify_helper: wait_time:', wait_time)