fix RE and fix print config
This commit is contained in:
Alexey Avramov
parent
059cf2e5b7
commit
c8a205ef50
134
nohang
134
nohang
@ -250,7 +250,8 @@ def send_notify_warn():
|
||||
])
|
||||
else: # Or by regular user
|
||||
# send notification to user that runs this nohang
|
||||
Popen(['notify-send', '--icon=dialog-warning', '{}'.format(title), '{}'.format(body)])
|
||||
Popen(['notify-send', '--icon=dialog-warning',
|
||||
'{}'.format(title), '{}'.format(body)])
|
||||
|
||||
|
||||
def send_notify(signal, name, pid):
|
||||
@ -264,7 +265,8 @@ def send_notify(signal, name, pid):
|
||||
title = 'Preventing OOM'
|
||||
body = '<b>{}</b> process <b>{}</b>, <b>{}</b>'.format(
|
||||
notify_sig_dict[signal], pid, name.replace(
|
||||
# сивол & может ломать уведомления в некоторых темах оформления, поэтому заменяется на *
|
||||
# сивол & может ломать уведомления в некоторых темах оформления,
|
||||
# поэтому заменяется на *
|
||||
'&', '*'))
|
||||
if root:
|
||||
# send notification to all active users with notify-send
|
||||
@ -327,6 +329,8 @@ def find_victim_and_send_signal(signal):
|
||||
"""
|
||||
Find victim with highest badness and send SIGTERM/SIGKILL
|
||||
"""
|
||||
print()
|
||||
|
||||
pid_badness_list = []
|
||||
|
||||
for pid in os.listdir('/proc'):
|
||||
@ -365,6 +369,7 @@ def find_victim_and_send_signal(signal):
|
||||
print(' Name matches with prefer_regex \033[33m{}\033[0m: \033[33m{}\033[0m, CmdLine: {}'.format(
|
||||
prefer_regex, name, cmdline))
|
||||
|
||||
|
||||
if search(avoid_re_cmdline, cmdline) is not None:
|
||||
badness = int(badness / avoid_cmd_factor)
|
||||
print(' Cmdline matches with avoid_re_cmdline \033[33m{}\033[0m: \033[33m{}\033[0m, Name: {}'.format(
|
||||
@ -375,13 +380,14 @@ def find_victim_and_send_signal(signal):
|
||||
print(' Cmdline matches with prefer_re_cmdline \033[33m{}\033[0m: \033[33m{}\033[0m, Name: {}'.format(
|
||||
prefer_re_cmdline, cmdline, name))
|
||||
|
||||
|
||||
if search(avoid_re_uid, uid) is not None:
|
||||
badness = int(badness / avoid_uid_factor)
|
||||
print(' UID matches with avoid_re_uid \033[33m{}\033[0m: \033[33m{}\033[0m, Name: {}'.format(
|
||||
avoid_re_uid, uid, name))
|
||||
|
||||
if search(prefer_re_uid, uid) is not None:
|
||||
badness = int((badness + 1) * prefer_cmd_factor)
|
||||
badness = int((badness + 1) * prefer_uid_factor)
|
||||
print(' UID matches with prefer_re_uid \033[33m{}\033[0m: \033[33m{}\033[0m, Name: {}'.format(
|
||||
prefer_re_uid, uid, name))
|
||||
|
||||
@ -391,7 +397,6 @@ def find_victim_and_send_signal(signal):
|
||||
badness = 0
|
||||
pid_badness_list.append((pid, badness))
|
||||
|
||||
|
||||
# Make list of (pid, badness) tuples, sorted by 'badness' values
|
||||
pid_tuple_list = sorted(
|
||||
pid_badness_list, key=itemgetter(1), reverse=True)[0]
|
||||
@ -407,7 +412,8 @@ def find_victim_and_send_signal(signal):
|
||||
|
||||
name = pid_to_name(pid)
|
||||
|
||||
# Get VmRSS and VmSwap and cmdline of victim process and try to send signal
|
||||
# Get VmRSS and VmSwap and cmdline of victim process and try to send
|
||||
# signal
|
||||
try:
|
||||
with open('/proc/' + pid + '/status') as f:
|
||||
for n, line in enumerate(f):
|
||||
@ -423,15 +429,18 @@ def find_victim_and_send_signal(signal):
|
||||
if detailed_rss:
|
||||
|
||||
if n is anon_index:
|
||||
anon_rss = kib_to_mib(int(line.split('\t')[1][:-4]))
|
||||
anon_rss = kib_to_mib(
|
||||
int(line.split('\t')[1][:-4]))
|
||||
continue
|
||||
|
||||
if n is file_index:
|
||||
file_rss = kib_to_mib(int(line.split('\t')[1][:-4]))
|
||||
file_rss = kib_to_mib(
|
||||
int(line.split('\t')[1][:-4]))
|
||||
continue
|
||||
|
||||
if n is shmem_index:
|
||||
shmem_rss = kib_to_mib(int(line.split('\t')[1][:-4]))
|
||||
shmem_rss = kib_to_mib(
|
||||
int(line.split('\t')[1][:-4]))
|
||||
continue
|
||||
|
||||
if n is vm_swap_index:
|
||||
@ -461,6 +470,7 @@ def find_victim_and_send_signal(signal):
|
||||
response_time = time() - time0
|
||||
|
||||
# todo: mem_info, victim_info, exe_info, signal_info
|
||||
# todo: display VmSize, oom_score, oom_score_adj
|
||||
|
||||
etc_info = ' Found the victim with highest badness:' \
|
||||
'\n Name: \033[33m{}\033[0m' \
|
||||
@ -478,7 +488,8 @@ def find_victim_and_send_signal(signal):
|
||||
|
||||
print(mem_info)
|
||||
print(etc_info)
|
||||
if gui_notifications: send_notify_etc(pid, name, command)
|
||||
if gui_notifications:
|
||||
send_notify_etc(pid, name, command)
|
||||
|
||||
else:
|
||||
|
||||
@ -517,7 +528,8 @@ def find_victim_and_send_signal(signal):
|
||||
else:
|
||||
|
||||
response_time = time() - time0
|
||||
victim_badness_is_too_small = ' victim badness {} < min_badness {}; nothing to do; response time: {} ms'.format(
|
||||
victim_badness_is_too_small = ' victim badness {} < min_b' \
|
||||
'adness {}; nothing to do; response time: {} ms'.format(
|
||||
victim_badness,
|
||||
min_badness,
|
||||
round(response_time * 1000))
|
||||
@ -801,7 +813,7 @@ try:
|
||||
etc_name = a[0].strip()
|
||||
etc_command = a[1].strip()
|
||||
if len(etc_name) > 15:
|
||||
print('Invalid config, the length of the process ' \
|
||||
print('Invalid config, the length of the process '
|
||||
'name must not exceed 15 characters\nExit')
|
||||
exit()
|
||||
etc_dict[etc_name] = etc_command
|
||||
@ -845,79 +857,79 @@ if regex_matching:
|
||||
|
||||
prefer_regex = conf_parse_string('prefer_regex')
|
||||
if prefer_regex == '':
|
||||
print('Invalid prefer_regex value, ' \
|
||||
print('Invalid prefer_regex value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(prefer_regex, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid prefer_regex value, ' \
|
||||
print('Invalid prefer_regex value, '
|
||||
'invalid RE pattern: {}'.format(prefer_regex))
|
||||
exit()
|
||||
|
||||
avoid_regex = conf_parse_string('avoid_regex')
|
||||
if avoid_regex == '':
|
||||
print('Invalid avoid_regex value, ' \
|
||||
print('Invalid avoid_regex value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(avoid_regex, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid avoid_regex value, ' \
|
||||
print('Invalid avoid_regex value, '
|
||||
'invalid RE pattern: {}'.format(avoid_regex))
|
||||
exit()
|
||||
|
||||
prefer_re_cmdline = conf_parse_string('prefer_re_cmdline')
|
||||
if prefer_re_cmdline == '':
|
||||
print('Invalid prefer_re_cmdline value, ' \
|
||||
print('Invalid prefer_re_cmdline value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(prefer_re_cmdline, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid prefer_re_cmdline value, ' \
|
||||
print('Invalid prefer_re_cmdline value, '
|
||||
'invalid RE pattern: {}'.format(prefer_re_cmdline))
|
||||
exit()
|
||||
|
||||
avoid_re_cmdline = conf_parse_string('avoid_re_cmdline')
|
||||
if avoid_re_cmdline == '':
|
||||
print('Invalid avoid_re_cmdline value, ' \
|
||||
print('Invalid avoid_re_cmdline value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(avoid_re_cmdline, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid avoid_re_cmdline value, ' \
|
||||
print('Invalid avoid_re_cmdline value, '
|
||||
'invalid RE pattern: {}'.format(avoid_re_cmdline))
|
||||
exit()
|
||||
|
||||
prefer_re_uid = conf_parse_string('prefer_re_uid')
|
||||
if prefer_re_uid == '':
|
||||
print('Invalid prefer_re_uid value, ' \
|
||||
print('Invalid prefer_re_uid value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(prefer_re_uid, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid prefer_re_uid value, ' \
|
||||
print('Invalid prefer_re_uid value, '
|
||||
'invalid RE pattern: {}'.format(prefer_re_uid))
|
||||
exit()
|
||||
|
||||
avoid_re_uid = conf_parse_string('avoid_re_uid')
|
||||
if avoid_re_uid == '':
|
||||
print('Invalid avoid_re_uid value, ' \
|
||||
print('Invalid avoid_re_uid value, '
|
||||
'regex pattern must not be empty')
|
||||
exit()
|
||||
# RE pattern validation
|
||||
try:
|
||||
search(avoid_re_uid, '')
|
||||
except sre_constants.error:
|
||||
print('Invalid avoid_re_uid value, ' \
|
||||
print('Invalid avoid_re_uid value, '
|
||||
'invalid RE pattern: {}'.format(avoid_re_uid))
|
||||
exit()
|
||||
|
||||
@ -1122,7 +1134,8 @@ else:
|
||||
|
||||
|
||||
if 'prefer_cmd_factor' in config_dict:
|
||||
prefer_cmd_factor = string_to_float_convert_test(config_dict['prefer_cmd_factor'])
|
||||
prefer_cmd_factor = string_to_float_convert_test(
|
||||
config_dict['prefer_cmd_factor'])
|
||||
if prefer_cmd_factor is None:
|
||||
print('Invalid prefer_cmd_factor value, not float\nExit')
|
||||
exit()
|
||||
@ -1135,7 +1148,8 @@ else:
|
||||
|
||||
|
||||
if 'avoid_cmd_factor' in config_dict:
|
||||
avoid_cmd_factor = string_to_float_convert_test(config_dict['avoid_cmd_factor'])
|
||||
avoid_cmd_factor = string_to_float_convert_test(
|
||||
config_dict['avoid_cmd_factor'])
|
||||
if avoid_cmd_factor is None:
|
||||
print('Invalid avoid_cmd_factor value, not float\nExit')
|
||||
exit()
|
||||
@ -1148,7 +1162,8 @@ else:
|
||||
|
||||
|
||||
if 'prefer_uid_factor' in config_dict:
|
||||
prefer_uid_factor = string_to_float_convert_test(config_dict['prefer_uid_factor'])
|
||||
prefer_uid_factor = string_to_float_convert_test(
|
||||
config_dict['prefer_uid_factor'])
|
||||
if prefer_uid_factor is None:
|
||||
print('Invalid prefer_uid_factor value, not float\nExit')
|
||||
exit()
|
||||
@ -1161,7 +1176,8 @@ else:
|
||||
|
||||
|
||||
if 'avoid_uid_factor' in config_dict:
|
||||
avoid_uid_factor = string_to_float_convert_test(config_dict['avoid_uid_factor'])
|
||||
avoid_uid_factor = string_to_float_convert_test(
|
||||
config_dict['avoid_uid_factor'])
|
||||
if avoid_uid_factor is None:
|
||||
print('Invalid avoid_uid_factor value, not float\nExit')
|
||||
exit()
|
||||
@ -1338,11 +1354,34 @@ if print_config:
|
||||
print('\n4. Impact on the badness of processes via matching their names\nwith regular expressions\n')
|
||||
print('regex_matching: {}'.format(regex_matching))
|
||||
if regex_matching:
|
||||
|
||||
print()
|
||||
print('prefer_regex: {}'.format(prefer_regex))
|
||||
print('prefer_factor: {}'.format(prefer_factor))
|
||||
|
||||
print()
|
||||
print('avoid_regex: {}'.format(avoid_regex))
|
||||
print('avoid_factor: {}'.format(avoid_factor))
|
||||
|
||||
print()
|
||||
print('prefer_re_cmdline: {}'.format(prefer_re_cmdline))
|
||||
print('prefer_cmd_factor: {}'.format(prefer_cmd_factor))
|
||||
|
||||
print()
|
||||
print('avoid_re_cmdline: {}'.format(avoid_re_cmdline))
|
||||
print('avoid_cmd_factor: {}'.format(avoid_cmd_factor))
|
||||
|
||||
print()
|
||||
print('prefer_re_uid: {}'.format(prefer_re_uid))
|
||||
print('prefer_uid_factor: {}'.format(prefer_uid_factor))
|
||||
|
||||
print()
|
||||
print('avoid_re_uid: {}'.format(avoid_re_uid))
|
||||
print('avoid_uid_factor: {}'.format(avoid_uid_factor))
|
||||
|
||||
|
||||
|
||||
|
||||
print('\n5. The execution of a specific command instead of sending the\nSIGTERM signal\n')
|
||||
print('execute_the_command: {}'.format(execute_the_command))
|
||||
if execute_the_command:
|
||||
@ -1366,7 +1405,8 @@ if print_config:
|
||||
round(zram_max_warnings_mb), round(zram_max_warnings_percent, 1)))
|
||||
|
||||
print(
|
||||
'\n7. Preventing the slowing down of the program\n[displaying these options need fix]\n')
|
||||
'\n7. Preventing the slowing down of the program'
|
||||
'\n[displaying these options need fix]\n')
|
||||
print('mlockall: {} ({})'.format(mlockall, mla_res))
|
||||
print('niceness: {} ({})'.format(
|
||||
niceness, niceness_result
|
||||
@ -1441,7 +1481,6 @@ while True:
|
||||
if swap_warn_is_percent:
|
||||
swap_min_warnings_kb = swap_total * swap_min_warnings_percent / 100.0
|
||||
|
||||
|
||||
# find MemUsedZram
|
||||
disksize_sum = 0
|
||||
mem_used_total_sum = 0
|
||||
@ -1466,7 +1505,6 @@ while True:
|
||||
mem_used_total_sum + disksize_sum * ZRAM_DISKSIZE_FACTOR
|
||||
) / 1024.0
|
||||
|
||||
|
||||
if print_mem_check_results:
|
||||
|
||||
# Calculate 'swap-column' width
|
||||
@ -1514,20 +1552,20 @@ while True:
|
||||
# else - just sleep
|
||||
|
||||
# MEM SWAP KILL
|
||||
if mem_available <= mem_min_sigkill_kb and swap_free <= swap_min_sigkill_kb:
|
||||
if mem_available <= mem_min_sigkill_kb and \
|
||||
swap_free <= swap_min_sigkill_kb:
|
||||
time0 = time()
|
||||
|
||||
mem_info = '\033[4mLow memory; corrective action required!\033[0m\n MemAvailable [{} MiB, {} %] <= mem_min_sigkill [{} MiB, {} %]\n Swa' \
|
||||
'pFree [{} MiB, {} %] <= swap_min_sigkill [{} MiB, {} %]'.format(
|
||||
mem_info = '\033[4mLow memory; corrective action required!' \
|
||||
'\033[0m\n MemAvailable [{} MiB, {} %] <= mem_min_sig' \
|
||||
'kill [{} MiB, {} %]\n SwapFree [{} MiB, {} %] <= swa' \
|
||||
'p_min_sigkill [{} MiB, {} %]'.format(
|
||||
kib_to_mib(mem_available),
|
||||
percent(mem_available / mem_total),
|
||||
|
||||
kib_to_mib(mem_min_sigkill_kb),
|
||||
percent(mem_min_sigkill_kb / mem_total),
|
||||
|
||||
kib_to_mib(swap_free),
|
||||
percent(swap_free / (swap_total + 0.1)),
|
||||
|
||||
kib_to_mib(swap_min_sigkill_kb),
|
||||
swap_sigkill_pc)
|
||||
|
||||
@ -1537,7 +1575,9 @@ while True:
|
||||
elif mem_used_zram >= zram_max_sigkill_kb:
|
||||
time0 = time()
|
||||
|
||||
mem_info = '\033[4mLow memory; corrective action required!\033[0m\n MemUsedZram [{} MiB, {} %] >= zram_max_sigkill [{} MiB, {} %]'.format(
|
||||
mem_info = '\033[4mLow memory; corrective action required!' \
|
||||
'\033[0m\n MemUsedZram [{} MiB, {} %] >= zram_max_sig' \
|
||||
'kill [{} MiB, {} %]'.format(
|
||||
kib_to_mib(mem_used_zram),
|
||||
percent(mem_used_zram / mem_total),
|
||||
kib_to_mib(zram_max_sigkill_kb),
|
||||
@ -1546,26 +1586,23 @@ while True:
|
||||
find_victim_and_send_signal(SIGKILL)
|
||||
|
||||
# MEM SWAP TERM
|
||||
elif mem_available <= mem_min_sigterm_kb and swap_free <= swap_min_sigterm_kb:
|
||||
elif mem_available <= mem_min_sigterm_kb and \
|
||||
swap_free <= swap_min_sigterm_kb:
|
||||
|
||||
time0 = time()
|
||||
|
||||
mem_info = '\033[4mLow memory; corrective action required!\033[0m\n MemAvailable [{} MiB, {} %] <= mem_min_sigterm [{} MiB, {} %]\n Sw' \
|
||||
'apFree [{} MiB, {} %] <= swap_min_sigterm [{} MiB, {} %]'.format(
|
||||
mem_info = '\033[4mLow memory; corrective action required!' \
|
||||
'\033[0m\n MemAvailable [{} MiB, {} %] <= mem_min_sig' \
|
||||
'term [{} MiB, {} %]\n SwapFree [{} MiB, {} %] <= swa' \
|
||||
'p_min_sigterm [{} MiB, {} %]'.format(
|
||||
kib_to_mib(mem_available),
|
||||
percent(mem_available / mem_total),
|
||||
|
||||
|
||||
kib_to_mib(mem_min_sigterm_kb),
|
||||
#percent(mem_min_sigterm_kb / mem_total),
|
||||
|
||||
# ОКРУГЛЯТЬ НА МЕСТЕ ВЫШЕ
|
||||
round(mem_min_sigterm_percent, 1),
|
||||
|
||||
kib_to_mib(swap_free),
|
||||
percent(swap_free / (swap_total + 0.1)),
|
||||
|
||||
|
||||
kib_to_mib(swap_min_sigterm_kb),
|
||||
swap_sigterm_pc)
|
||||
|
||||
@ -1575,8 +1612,9 @@ while True:
|
||||
elif mem_used_zram >= zram_max_sigterm_kb:
|
||||
time0 = time()
|
||||
|
||||
mem_info = '\033[4mLow memory; corrective action required!\033[0m\n MemUsedZram [{} MiB, {} %] >= zram_max_sigter' \
|
||||
'm [{} M, {} %]'.format(
|
||||
mem_info = '\033[4mLow memory; corrective action ' \
|
||||
'required!\033[0m\n MemUsedZram [{} MiB, {} ' \
|
||||
'%] >= zram_max_sigterm [{} M, {} %]'.format(
|
||||
kib_to_mib(mem_used_zram),
|
||||
percent(mem_used_zram / mem_total),
|
||||
kib_to_mib(zram_max_sigterm_kb),
|
||||
|
||||
31
nohang.conf
31
nohang.conf
@ -98,7 +98,7 @@ min_badness = 10
|
||||
Valid values are non-negative floating-point numbers.
|
||||
|
||||
min_delay_after_sigterm = 0.5
|
||||
min_delay_after_sigkill = 3
|
||||
min_delay_after_sigkill = 2
|
||||
|
||||
Процессы браузера chromium обычно имеют oom_score_adj
|
||||
200 или 300. Это приводит к тому, что процессы хрома умирают
|
||||
@ -144,11 +144,7 @@ regex_matching = False
|
||||
|
||||
Matching process names with RE patterns
|
||||
|
||||
Прблема в том, что если включил регекс, то нельзя выключить
|
||||
ненужный мэтчинг. Можно только установить фактор в единицу.
|
||||
Нужен редизайн раздела.
|
||||
|
||||
prefer_regex = foo
|
||||
prefer_regex = ^()$
|
||||
|
||||
Valid values are floating-point numbers from the range [1; 1000].
|
||||
|
||||
@ -160,23 +156,22 @@ prefer_factor = 2
|
||||
|
||||
# Need more examples
|
||||
|
||||
avoid_regex = ^(Xorg|sshd)$
|
||||
avoid_regex = ^(Xorg|ssd)$
|
||||
|
||||
Valid values are floating-point numbers from the range [1; 1000].
|
||||
|
||||
avoid_factor = 2
|
||||
avoid_factor = 3
|
||||
|
||||
|
||||
Matching cmlines with RE patterns
|
||||
Matching cmdlines with RE patterns
|
||||
|
||||
# re_match_cmdline = True
|
||||
|
||||
prefer_re_cmdline = ^/usr/lib/firefox
|
||||
# this default pattern for prefer childs of chromium & firefox
|
||||
prefer_re_cmdline = renderer|childID
|
||||
prefer_cmd_factor = 10
|
||||
|
||||
avoid_re_cmdline = ^/usr/lib/virtualbox
|
||||
|
||||
prefer_cmd_factor = 3
|
||||
|
||||
avoid_cmd_factor = 3
|
||||
|
||||
|
||||
@ -184,13 +179,11 @@ avoid_cmd_factor = 3
|
||||
|
||||
# re_match_uid = True
|
||||
|
||||
prefer_re_uid = ^(1000)$
|
||||
prefer_re_uid = ^()$
|
||||
prefer_uid_factor = 1
|
||||
|
||||
avoid_re_uid= ^(0|33)$
|
||||
|
||||
prefer_uid_factor = 3
|
||||
|
||||
avoid_uid_factor = 3
|
||||
avoid_re_uid = ^()$
|
||||
avoid_uid_factor = 1
|
||||
|
||||
#####################################################################
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user