[docker-teamd]: Refactor cleanup procedure. #441
Closed
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
|
Depends on: |
|
Please update this PR when both PR are merged into sonic-swss |
lguohan
requested changes
Mar 29, 2017
|
@stcheng Please help review |
stcheng
suggested changes
Apr 8, 2017
dockers/docker-teamd/Dockerfile.j2
Outdated
| @@ -26,5 +26,4 @@ ENV DEBIAN_FRONTEND=noninteractive | |||
| RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y | |||
| RUN rm -rf /debs | |||
|
|
|||
| ENTRYPOINT ["/bin/bash", "-c"] | |||
| CMD ["/usr/bin/config.sh && /usr/bin/start.sh"] | |||
| ENTRYPOINT ["/usr/bin/start.sh"] | |||
There was a problem hiding this comment.
I think we could use /bin/bash as ENTRYPOINT and /usr/bin/start.sh as CMD. Thus even when the start.sh fails at some unknown point, the docker won't exit and dev could attach to the docker and debug. The Dockerfile could be similar to docker-orchagent/Dockerfile.j2.
dockers/docker-teamd/start.sh
Outdated
| pkill -9 teamd | ||
| if [ -d $TEAMD_CONF_PATH ]; then | ||
| for f in $TEAMD_CONF_PATH/*; do | ||
| teamd -f $f -k |
There was a problem hiding this comment.
So I believe this will successfully stop all the team instances without leaving anything that needs to be manually cleaned up after the next docker starts?
There was a problem hiding this comment.
-k option kills corresponding daemon and deletes LAG interface
stcheng
approved these changes
Apr 12, 2017
taoyl-ms
reviewed
Apr 19, 2017
| @@ -26,5 +26,5 @@ ENV DEBIAN_FRONTEND=noninteractive | |||
| RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y | |||
| RUN rm -rf /debs | |||
|
|
|||
| ENTRYPOINT ["/bin/bash", "-c"] | |||
| CMD ["/usr/bin/config.sh && /usr/bin/start.sh"] | |||
There was a problem hiding this comment.
Is there any special reason that we need to merge config.sh and start.sh back into one file?
There was a problem hiding this comment.
Reason for that is to correctly handle signals sent to container.
See #435
stcheng
suggested changes
Apr 20, 2017
dockers/docker-teamd/start.sh
Outdated
| teamd -f $f -d | ||
| done | ||
| fi | ||
| teamsyncd & | ||
| } | ||
|
|
||
| function clean_up { | ||
| pkill -9 teamd | ||
| if [ -d $TEAMD_CONF_PATH ]; then | ||
| for f in $TEAMD_CONF_PATH/*; do |
There was a problem hiding this comment.
check if the folder is empty or not. if the folder is empty, the variable f will become /etc/teamd/*.
Signed-off-by: marian-pritsak <[email protected]>
Signed-off-by: marian-pritsak <[email protected]>
Signed-off-by: marian-pritsak <[email protected]>
|
Rebased and fixed merge conflicts |
|
Still pending issue #497 |
|
@marian-pritsak I have tried the patch. I notice that even with |
|
@stcheng which command did you execute? I did the following test: I added echo messages into each function for debug, and I can see cleanup is called: |
|
@marian-pritsak: I am currently working on a PR that will change all docker ENTRYPOINTs to run supervisord. This will fix issue #435. I say we hold off on merging this PR until after I submit my PR. |
|
@jleveque thanks. |
|
@marian-pritsak, thanks for signing the contribution license agreement. We will now validate the agreement and then the pull request. |
qiluo-msft
added a commit
to qiluo-msft/sonic-buildimage
that referenced
this pull request
Jan 7, 2021
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (sonic-net#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (sonic-net#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (sonic-net#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (sonic-net#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (sonic-net#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (sonic-net#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (sonic-net#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (sonic-net#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (sonic-net#435) [Ze Gan] ```
qiluo-msft
added a commit
that referenced
this pull request
Jan 8, 2021
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan] ```
lguohan
pushed a commit
that referenced
this pull request
Jan 9, 2021
Includes sonic-swss-common commits: ``` 71dc350 2021-01-07 | Lower the log level for outdated key for SubscriberStateTable notification (#441) [Qi Luo] 7e40582 2021-01-08 | Add boost dependencies (#442) [Ze Gan] 30a8ddf 2021-01-05 | Change DBConnector::hgetall return type from map to unordered_map (#440) [Qi Luo] 021108d 2021-01-02 | MCLAG Enhancements per HLD sonic-net/SONiC#596 (#405) [Praveen-Brcm] 54996fc 2021-01-02 | Implement ConfigDBConnector and ConfigDBPipeConnector in C++ (#437) [Qi Luo] 8286525 2020-12-27 | Simply refactor DBConnector hgetall() [Qi Luo] 6d1d33b 2020-12-27 | Fix RedisTransactioner: handle empty deque [Qi Luo] 624e0b8 2020-12-26 | Move complex class constructor as explicit, and fix several mistaken copy constructor usage [Qi Luo] 3b983f9 2020-12-30 | [ci]: add timeout to 180 minutes for arm build (#439) [lguohan] f2e4210 2020-12-29 | Add utility for string and redis (#434) [Ze Gan] 7a885fd 2020-12-29 | [build]: add build check for arm64 and armhf (#436) [lguohan] 47bccc4 2020-12-24 | Add missed vector header to rediscommand.h (#435) [Ze Gan] ```
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.
Signed-off-by: marian-pritsak [email protected]