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

fix find_victim

Browse Source
This commit is contained in:
Alexey Avramov
2019-01-11 02:04:40 +09:00
parent 020bdf3f09
commit 522d1507ee
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
nohang
View File

@@ -578,51 +578,62 @@ def find_victim_and_send_signal(signal):
except FileNotFoundError: except FileNotFoundError:
print('The victim died in the search process') print('The victim died in the search process')
# update stat_dict # update stat_dict
key = 'The victim died in the search process' key = 'The victim died in the search process'
if key not in stat_dict: if key not in stat_dict:
stat_dict.update({key: 1}) stat_dict.update({key: 1})
else: else:
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value}
for key in stat_dict:
stats_msg += '\n - {}: {}'.format(key, stat_dict[key])
print(stats_msg)
return None return None
except ProcessLookupError: except ProcessLookupError:
print('The victim died in the search process') print('The victim died in the search process')
# update stat_dict # update stat_dict
key = 'The victim died in the search process' key = 'The victim died in the search process'
if key not in stat_dict: if key not in stat_dict:
stat_dict.update({key: 1}) stat_dict.update({key: 1})
else: else:
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value}
for key in stat_dict:
stats_msg += '\n - {}: {}'.format(key, stat_dict[key])
print(stats_msg)
return None return None
except IndexError: except IndexError:
print('The victim died in the search process') print('The victim died in the search process')
# update stat_dict # update stat_dict
key = 'The victim died in the search process' key = 'The victim died in the search process'
if key not in stat_dict: if key not in stat_dict:
stat_dict.update({key: 1}) stat_dict.update({key: 1})
else: else:
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value}
for key in stat_dict:
stats_msg += '\n - {}: {}'.format(key, stat_dict[key])
print(stats_msg)
return None return None
except ValueError: except ValueError:
print('The victim died in the search process') print('The victim died in the search process')
# update stat_dict # update stat_dict
key = 'The victim died in the search process' key = 'The victim died in the search process'
if key not in stat_dict: if key not in stat_dict:
stat_dict.update({key: 1}) stat_dict.update({key: 1})
else: else:
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value}
for key in stat_dict:
stats_msg += '\n - {}: {}'.format(key, stat_dict[key])
print(stats_msg)
return None return None
len_vm = len(str(vm_size)) len_vm = len(str(vm_size))
@@ -704,6 +715,10 @@ def find_victim_and_send_signal(signal):
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value})
for key in stat_dict:
stats_msg += '\n - {}: {}'.format(key, stat_dict[key])
print(mem_info) print(mem_info)
print(etc_info) print(etc_info)
@@ -734,7 +749,7 @@ def find_victim_and_send_signal(signal):
response_time = time() - time0 response_time = time() - time0
send_result = 'no such process; response time: {} ms'.format( send_result = 'no such process; response time: {} ms'.format(
round(response_time * 1000)) round(response_time * 1000))
# update stat_dict # update stat_dict
key = 'The victim died in the search process' key = 'The victim died in the search process'
if key not in stat_dict: if key not in stat_dict:
@@ -742,7 +757,7 @@ def find_victim_and_send_signal(signal):
else: else:
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value})
except ProcessLookupError: except ProcessLookupError:
response_time = time() - time0 response_time = time() - time0
send_result = 'no such process; response time: {} ms'.format( send_result = 'no such process; response time: {} ms'.format(
@@ -757,10 +772,6 @@ def find_victim_and_send_signal(signal):
new_value = stat_dict[key] + 1 new_value = stat_dict[key] + 1
stat_dict.update({key: new_value}) stat_dict.update({key: new_value})
preventing_oom_message = '{}' \ preventing_oom_message = '{}' \
'\n\033[4mImplement a corrective action:\033[0m\n ' \ '\n\033[4mImplement a corrective action:\033[0m\n ' \
'Sending \033[4m{}\033[0m to the victim; {}'.format( 'Sending \033[4m{}\033[0m to the victim; {}'.format(