saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle zombie processes when getting pids

Browse source
This commit is contained in:
twangboy 2024-10-29 08:45:57 -06:00 • committed by Daniel Wozniak
parent 2d110410d1
commit 1168334a40
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/pytests/pkg/downgrade/test_salt_downgrade.py
View file

@ -18,16 +18,26 @@ def _get_running_named_salt_pid(process_name):
pids = []
for proc in psutil.process_iter():
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
if process_name in cmdl_strg:
pids.append(proc.pid)
cmd_line = ""
try:
cmd_line = " ".join(str(element) for element in proc.cmdline())
except psutil.ZombieProcess:
# Even though it's a zombie process, it still has a cmdl_string and
# a pid, so we'll use it
pass
if process_name in cmd_line:
try:
pids.append(proc.pid)
except psutil.NoSuchProcess:
# Process is now closed
continue
return pids
def test_salt_downgrade_minion(salt_call_cli, install_salt):
"""
Test an downgrade of Salt Minion.
Test a downgrade of Salt Minion.
"""
is_restart_fixed = packaging.version.parse(
install_salt.prev_version