[docker-wait-any] End child threads when main thread is signalled to end #10812
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 tasks
lguohan
pushed a commit
that referenced
this pull request
May 22, 2024
Fix docker-wait-any script crash issue. Why I did it docker-wait-any script will create a waiting thread for multiple containers. When any container thread exit, g_thread_exit_event will set, and main thread will exit. However when this happen, some thread may still waiting container with following code: docker_client.wait(container_name) Because docker_client will be destroyed when main thread exist, some time wait method will throw TypeError, and this will cause swss.sh crash then swss container can't start: <30>May 13 07:11:22 DEVICE_NAME swss.sh[13603]: Traceback (most recent call last): <30>May 13 07:11:22 DEVICE_NAME swss.sh[13603]: Exception in thread Thread-1: ... <30>May 13 07:11:22 DEVICE_NAME swss.sh[13603]: while docker_client.inspect_container(container_name)['State']['Status'] != "running": ... <30>May 13 07:11:23 DEVICE_NAME swss.sh[13603]: TypeError: 'NoneType' object is not callable <13>May 13 07:11:23 DEVICE_NAME root: Stopping swss service... This PR is based on analyze result of following PR: #10812 Microsoft ADO: 28052815
|
This change was merged as part of #19009 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
This is to fix a bug in
docker-wait-anyscript which leads to Exceptions during shutdown path for services.Reason for this error:
docker-wait-anyas part of systemctl wait function.docker-wait-anycreates different threads that wait as long as dependent services are running.docker_clientinstance which is owned by main thread.docker_clientinstance, but the child threads are still running and use the samedocker_clientinstance.Error trace shows that the error is always originated during chilkd thread accessing
docker_client, which is being freed up by main thread:Instance 1:
Instance 2:
Instance 3:
How I did it
Child thread should break out of infinite loop after signaling main thread to unblock and exit.
How to verify it
Tried multiple times on physical testbed and issue is not seen with this fix,
Which release branch to backport (provide reason below if selected)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)