Skip to content

fix(ptfadapter): tolerate supervisorctl restart spawn errors #24749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
auspham wants to merge 1 commit into from
+7 −3
Closed

fix(ptfadapter): tolerate supervisorctl restart spawn errors #24749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions tests/common/plugins/ptfadapter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,15 @@ def start_ptf_nn_agent(device_num):
ptfhost.command('supervisorctl update')

# Force a restart of ptf_nn_agent to ensure that it is in good status.
ptfhost.command('supervisorctl restart ptf_nn_agent')
# Ignore command errors so that a transient "ERROR (spawn error)" (for
# example, a port collision on the randomly-picked ptf_nn_port) does
# not bypass the surrounding retry loop with a different port.
ptfhost.command('supervisorctl restart ptf_nn_agent', module_ignore_errors=True)

# check whether ptf_nn_agent starts successfully
if "RUNNING" in ptfhost.command('supervisorctl status ptf_nn_agent',
module_ignore_errors=True)["stdout_lines"][0]:
status_lines = ptfhost.command('supervisorctl status ptf_nn_agent',
module_ignore_errors=True)["stdout_lines"]
if status_lines and "RUNNING" in status_lines[0]:
return ptf_nn_port
return None

Expand Down
Loading