Skip to content

Workaround for "dead worker" after docker-sonic-mgmt upgrade #21407

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

Merged
StormLiangMS merged 1 commit into from
Nov 25, 2025
Merged

Workaround for "dead worker" after docker-sonic-mgmt upgrade #21407

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
88 changes: 45 additions & 43 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@

logger = logging.getLogger(__name__)
cache = FactsCache()
_ansible_tqm_lock = threading.Lock()

DUTHOSTS_FIXTURE_FAILED_RC = 15
CUSTOM_MSG_PREFIX = "sonic_custom_msg"
Expand Down Expand Up @@ -858,49 +859,50 @@ def nbrhosts(enhance_inventory, ansible_adhoc, tbinfo, creds, request):
return devices

def initial_neighbor(neighbor_name, vm_name):
logger.info(f"nbrhosts started: {neighbor_name}_{vm_name}")
if neighbor_type == "eos":
device = NeighborDevice(
{
'host': EosHost(
ansible_adhoc,
vm_name,
creds['eos_login'],
creds['eos_password'],
shell_user=creds['eos_root_user'] if 'eos_root_user' in creds else None,
shell_passwd=creds['eos_root_password'] if 'eos_root_password' in creds else None
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
elif neighbor_type == "sonic":
device = NeighborDevice(
{
'host': SonicHost(
ansible_adhoc,
vm_name,
ssh_user=creds['sonic_login'] if 'sonic_login' in creds else None,
ssh_passwd=creds['sonic_password'] if 'sonic_password' in creds else None
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
elif neighbor_type == "cisco":
device = NeighborDevice(
{
'host': CiscoHost(
ansible_adhoc,
vm_name,
creds['cisco_login'],
creds['cisco_password'],
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
else:
raise ValueError("Unknown neighbor type %s" % (neighbor_type,))
devices[neighbor_name] = device
logger.info(f"nbrhosts finished: {neighbor_name}_{vm_name}")
with _ansible_tqm_lock:
logger.info(f"nbrhosts started: {neighbor_name}_{vm_name}")
if neighbor_type == "eos":
device = NeighborDevice(
{
'host': EosHost(
ansible_adhoc,
vm_name,
creds['eos_login'],
creds['eos_password'],
shell_user=creds['eos_root_user'] if 'eos_root_user' in creds else None,
shell_passwd=creds['eos_root_password'] if 'eos_root_password' in creds else None
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
elif neighbor_type == "sonic":
device = NeighborDevice(
{
'host': SonicHost(
ansible_adhoc,
vm_name,
ssh_user=creds['sonic_login'] if 'sonic_login' in creds else None,
ssh_passwd=creds['sonic_password'] if 'sonic_password' in creds else None
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
elif neighbor_type == "cisco":
device = NeighborDevice(
{
'host': CiscoHost(
ansible_adhoc,
vm_name,
creds['cisco_login'],
creds['cisco_password'],
),
'conf': tbinfo['topo']['properties']['configuration'][neighbor_name]
}
)
else:
raise ValueError("Unknown neighbor type %s" % (neighbor_type,))
devices[neighbor_name] = device
logger.info(f"nbrhosts finished: {neighbor_name}_{vm_name}")

executor = concurrent.futures.ThreadPoolExecutor(max_workers=8)
futures = []
Expand Down
Loading