add @ENVIRON_RE
This commit is contained in:
Alexey Avramov
parent
cefd44c3df
commit
2b7436c52d
96
nohang
96
nohang
@ -85,8 +85,8 @@ def write_self_oom_score_adj(new_value):
|
||||
write('/proc/self/oom_score_adj', new_value)
|
||||
|
||||
|
||||
self_oom_score_adj_min = '-900'
|
||||
self_oom_score_adj_max = '-9'
|
||||
self_oom_score_adj_min = '-600'
|
||||
self_oom_score_adj_max = '-6'
|
||||
|
||||
|
||||
write_self_oom_score_adj(self_oom_score_adj_min)
|
||||
@ -339,6 +339,20 @@ def pid_to_cmdline(pid):
|
||||
return ''
|
||||
|
||||
|
||||
def pid_to_environ(pid):
|
||||
"""
|
||||
Get process environ by pid.
|
||||
|
||||
pid: str pid of required process
|
||||
returns string environ
|
||||
"""
|
||||
try:
|
||||
with open('/proc/' + pid + '/environ') as f:
|
||||
return f.read().replace('\x00', ' ').rstrip()
|
||||
except FileNotFoundError:
|
||||
return ''
|
||||
|
||||
|
||||
def pid_to_realpath(pid):
|
||||
try:
|
||||
return os.path.realpath('/proc/' + pid + '/exe')
|
||||
@ -398,6 +412,12 @@ def pid_to_badness(pid):
|
||||
if search(re_tup[1], cmdline) is not None:
|
||||
badness += int(re_tup[0])
|
||||
|
||||
if re_match_environ:
|
||||
environ = pid_to_environ(pid)
|
||||
for re_tup in environ_re_list:
|
||||
if search(re_tup[1], environ) is not None:
|
||||
badness += int(re_tup[0])
|
||||
|
||||
if re_match_uid:
|
||||
uid = pid_to_uid(pid)
|
||||
for re_tup in uid_re_list:
|
||||
@ -456,7 +476,7 @@ def pid_to_status(pid):
|
||||
return name, state, ppid, uid, vm_size, vm_rss, vm_swap
|
||||
|
||||
except UnicodeDecodeError:
|
||||
return pid_to_status2(pid)
|
||||
return pid_to_status_unicode(pid)
|
||||
|
||||
except FileNotFoundError:
|
||||
return None
|
||||
@ -464,8 +484,11 @@ def pid_to_status(pid):
|
||||
except ProcessLookupError:
|
||||
return None
|
||||
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
def pid_to_status2(pid):
|
||||
|
||||
def pid_to_status_unicode(pid):
|
||||
"""
|
||||
"""
|
||||
try:
|
||||
@ -505,6 +528,9 @@ def pid_to_status2(pid):
|
||||
except ProcessLookupError:
|
||||
return None
|
||||
|
||||
except ValueError:
|
||||
return None
|
||||
|
||||
|
||||
##########################################################################
|
||||
|
||||
@ -997,6 +1023,14 @@ def find_victim(_print_proc_table):
|
||||
elif extra_table_info == 'cmdline':
|
||||
extra_table_title = 'cmdline'
|
||||
|
||||
|
||||
elif extra_table_info == 'environ':
|
||||
extra_table_title = 'environ'
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
elif extra_table_info == 'realpath':
|
||||
extra_table_title = 'realpath'
|
||||
|
||||
@ -1040,6 +1074,9 @@ def find_victim(_print_proc_table):
|
||||
elif extra_table_info == 'cmdline':
|
||||
extra_table_line = pid_to_cmdline(pid)
|
||||
|
||||
elif extra_table_info == 'environ':
|
||||
extra_table_line = pid_to_environ(pid)
|
||||
|
||||
elif extra_table_info == 'realpath':
|
||||
extra_table_line = pid_to_realpath(pid)
|
||||
|
||||
@ -1153,6 +1190,7 @@ def find_victim_info(pid, victim_badness, name):
|
||||
break
|
||||
|
||||
cmdline = pid_to_cmdline(pid)
|
||||
environ = pid_to_environ(pid)
|
||||
oom_score = rline1('/proc/' + pid + '/oom_score')
|
||||
oom_score_adj = rline1('/proc/' + pid + '/oom_score_adj')
|
||||
|
||||
@ -1276,6 +1314,7 @@ def find_victim_info(pid, victim_badness, name):
|
||||
'\n CGroup: {}' \
|
||||
'\n Realpath: {}' \
|
||||
'\n Cmdline: {}' \
|
||||
'\n Environ: {}' \
|
||||
'\n Lifetime: {}'.format(
|
||||
round((time() - status0) * 1000),
|
||||
name,
|
||||
@ -1293,6 +1332,7 @@ def find_victim_info(pid, victim_badness, name):
|
||||
victim_cgroup,
|
||||
realpath,
|
||||
cmdline,
|
||||
environ,
|
||||
victim_lifetime)
|
||||
|
||||
return victim_info
|
||||
@ -1716,6 +1756,8 @@ config_dict = dict()
|
||||
|
||||
processname_re_list = []
|
||||
cmdline_re_list = []
|
||||
environ_re_list = []
|
||||
|
||||
uid_re_list = []
|
||||
cgroup_re_list = []
|
||||
realpath_re_list = []
|
||||
@ -1761,13 +1803,16 @@ try:
|
||||
exit(1)
|
||||
etc_dict[etc_name] = etc_command
|
||||
|
||||
|
||||
|
||||
|
||||
if line.startswith('@PROCESSNAME_RE'):
|
||||
a = line.partition(
|
||||
'@PROCESSNAME_RE')[2].strip(' \n').partition('///')
|
||||
badness_adj = a[0].strip(' ')
|
||||
reg_exp = a[2].strip(' ')
|
||||
valid_re(reg_exp)
|
||||
cgroup_re_list.append((badness_adj, reg_exp))
|
||||
processname_re_list.append((badness_adj, reg_exp))
|
||||
|
||||
if line.startswith('@CMDLINE_RE'):
|
||||
a = line.partition(
|
||||
@ -1775,7 +1820,7 @@ try:
|
||||
badness_adj = a[0].strip(' ')
|
||||
reg_exp = a[2].strip(' ')
|
||||
valid_re(reg_exp)
|
||||
cgroup_re_list.append((badness_adj, reg_exp))
|
||||
cmdline_re_list.append((badness_adj, reg_exp))
|
||||
|
||||
if line.startswith('@UID_RE'):
|
||||
a = line.partition(
|
||||
@ -1783,7 +1828,7 @@ try:
|
||||
badness_adj = a[0].strip(' ')
|
||||
reg_exp = a[2].strip(' ')
|
||||
valid_re(reg_exp)
|
||||
cgroup_re_list.append((badness_adj, reg_exp))
|
||||
uid_re_list.append((badness_adj, reg_exp))
|
||||
|
||||
if line.startswith('@CGROUP_RE'):
|
||||
a = line.partition(
|
||||
@ -1801,6 +1846,16 @@ try:
|
||||
valid_re(reg_exp)
|
||||
realpath_re_list.append((badness_adj, reg_exp))
|
||||
|
||||
if line.startswith('@ENVIRON_RE'):
|
||||
a = line.partition(
|
||||
'@ENVIRON_RE')[2].strip(' \n').partition('///')
|
||||
badness_adj = a[0].strip(' ')
|
||||
reg_exp = a[2].strip(' ')
|
||||
valid_re(reg_exp)
|
||||
environ_re_list.append((badness_adj, reg_exp))
|
||||
|
||||
|
||||
|
||||
|
||||
except PermissionError:
|
||||
errprint('PermissionError', conf_err_mess)
|
||||
@ -1819,9 +1874,16 @@ except FileNotFoundError:
|
||||
exit(1)
|
||||
|
||||
|
||||
# print(processname_re_list)
|
||||
# print(cmdline_re_list)
|
||||
# print(uid_re_list)
|
||||
print(processname_re_list)
|
||||
print(cmdline_re_list)
|
||||
print(uid_re_list)
|
||||
print(environ_re_list)
|
||||
print(realpath_re_list)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
##########################################################################
|
||||
|
||||
@ -1847,6 +1909,12 @@ re_match_cmdline = conf_parse_bool('re_match_cmdline')
|
||||
re_match_uid = conf_parse_bool('re_match_uid')
|
||||
re_match_cgroup = conf_parse_bool('re_match_cgroup')
|
||||
re_match_realpath = conf_parse_bool('re_match_realpath')
|
||||
re_match_environ = conf_parse_bool('re_match_environ')
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# if regex_matching or re_match_cmdline or re_match_uid or re_match_cgroup
|
||||
@ -2110,10 +2178,10 @@ else:
|
||||
if 'extra_table_info' in config_dict:
|
||||
extra_table_info = config_dict['extra_table_info']
|
||||
if (extra_table_info != 'None' and extra_table_info != 'cgroup' and
|
||||
extra_table_info != 'cmdline' and extra_table_info != 'realpath' and
|
||||
extra_table_info != 'All'):
|
||||
errprint('Invalid config: invalid extra_table_info value\nExit')
|
||||
exit(1)
|
||||
extra_table_info != 'cmdline' and extra_table_info != 'environ' and
|
||||
extra_table_info != 'realpath' and extra_table_info != 'All'):
|
||||
errprint('Invalid config: invalid extra_table_info value\nExit')
|
||||
exit(1)
|
||||
else:
|
||||
errprint('Invalid config: extra_table_info is not in config\nExit')
|
||||
exit(1)
|
||||
|
||||
18
nohang.conf
18
nohang.conf
@ -196,7 +196,7 @@ regex_matching = False
|
||||
|
||||
@PROCESSNAME_RE -100 /// ^Xorg$
|
||||
|
||||
@PROCESSNAME_RE -500 /// ^sshd$
|
||||
@PROCESSNAME_RE -500 /// ^sshd$
|
||||
|
||||
5.2 Matching cmdlines with RE patterns
|
||||
|
||||
@ -206,7 +206,7 @@ re_match_cmdline = False
|
||||
|
||||
@CMDLINE_RE 300 /// -childID|--type=renderer
|
||||
|
||||
@CMDLINE_RE -200 /// ^/usr/lib/virtualbox
|
||||
@CMDLINE_RE -200 /// ^/usr/lib/virtualbox
|
||||
|
||||
5.3 Matching UIDs with RE patterns
|
||||
|
||||
@ -220,7 +220,7 @@ re_match_uid = False
|
||||
|
||||
re_match_cgroup = False
|
||||
|
||||
@CGROUP_RE -50 /// system.slice
|
||||
@CGROUP_RE -50 /// system.slice
|
||||
|
||||
@CGROUP_RE 50 /// foo.service
|
||||
|
||||
@ -232,6 +232,15 @@ re_match_realpath = False
|
||||
|
||||
@REALPATH_RE 20 /// ^/usr/bin/foo
|
||||
|
||||
|
||||
5.6 Matching environ with RE patterns
|
||||
|
||||
re_match_environ = True
|
||||
|
||||
@ENVIRON_RE 100 /// USER=user
|
||||
|
||||
|
||||
|
||||
Note that you can control badness also via systemd units via OOMScoreAdjust, see
|
||||
https://www.freedesktop.org/software/systemd/man/systemd.exec.html#OOMScoreAdjust=
|
||||
|
||||
@ -349,10 +358,11 @@ print_proc_table = True
|
||||
None
|
||||
cgroup
|
||||
cmdline
|
||||
environ
|
||||
realpath
|
||||
All
|
||||
|
||||
extra_table_info = cgroup
|
||||
extra_table_info = environ
|
||||
|
||||
print_victim_info = True
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user