[dockers] Update critical_processes file syntax #4831
Merged
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
… entries. One kind of entry is "program:xxx" which indicates a critical process. Another is "group:xxx" which indicates a group of critical processes managed by supervisord using the name "xxx". I also updated the logic to parse the file critical_processes in supervisor-proc-event-listener script. Signed-off-by: Yong Zhao <yozhao@microsoft.com>
Signed-off-by: Yong Zhao <yozhao@microsoft.com>
jleveque
changed the title
critical_processes file. Signed-off-by: Yong Zhao <yozhao@microsoft.com>
jleveque
suggested changes
Jun 23, 2020
to handle the cases such as the process name is "group" or "program". Signed-off-by: Yong Zhao <yozhao@microsoft.com>
jleveque
suggested changes
Jun 23, 2020
Fixed the conflicts. |
jleveque
previously approved these changes
Jun 23, 2020
|
@yozhao101: This will not cherry-pick cleanly to the 201911 branch due to the directory name changes and the absence of new containers, so you will also need to open a separate PR against that branch. |
Yes, I will open a new PR against 201911 branch. |
Signed-off-by: Yong Zhao <yozhao@microsoft.com>
jleveque
approved these changes
Jun 23, 2020
lguohan
approved these changes
Jun 25, 2020
|
retest broadcom please |
|
Retest broadcom please |
yxieca
approved these changes
Jun 25, 2020
|
Retest broadcom please |
jleveque
pushed a commit
that referenced
this pull request
Jun 26, 2020
Backport of #4831 to the 201911 branch
pjaipakdee19
pushed a commit
to pjaipakdee19/sonic-buildimage
that referenced
this pull request
Jul 7, 2020
**- Why I did it** Initially, the critical_processes file contains either the name of critical process or the name of group. For example, the critical_processes file in the dhcp_relay container contains a single group name `isc-dhcp-relay`. When testing the autorestart feature of each container, we need get all the critical processes and test whether a container can be restarted correctly if one of its critical processes is killed. However, it will be difficult to differentiate whether the names in the critical_processes file are the critical processes or group names. At the same time, changing the syntax in this file will separate the individual process from the groups and also makes it clear to the user. Right now the critical_processes file contains two different kind of entries. One is "program:xxx" which indicates a critical process. Another is "group:xxx" which indicates a group of critical processes managed by supervisord using the name "xxx". At the same time, I also updated the logic to parse the file critical_processes in supervisor-proc-event-listener script. **- How to verify it** We can first enable the autorestart feature of a specified container for example `dhcp_relay` by running the comman `sudo config container feature autorestart dhcp_relay enabled` on DUT. Then we can select a critical process from the command `docker top dhcp_relay` and use the command `sudo kill -SIGKILL <pid>` to kill that critical process. Final step is to check whether the container is restarted correctly or not.
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: Yong Zhao yozhao@microsoft.com
- Why I did it
Initially, the critical_processes file contains either the name of critical process or the name of group.
For example, the critical_processes file in the dhcp_relay container contains a single group name
isc-dhcp-relay. When testing the autorestart feature of each container, we need get all the criticalprocesses and test whether a container can be restarted correctly if one of its critical processes is
killed. However, it will be difficult to differentiate whether the names in the critical_processes file are
the critical processes or group names. At the same time, changing the syntax in this file will separate the individual process from the groups and also makes it clear to the user.
Right now the critical_processes file contains two different kind of entries. One is "program:xxx" which indicates a critical process. Another is "group:xxx" which indicates a group of critical processes
managed by supervisord using the name "xxx". At the same time, I also updated the logic to
parse the file critical_processes in supervisor-proc-event-listener script.
- How I did it
- How to verify it
We can first enable the autorestart feature of a specified container for example
dhcp_relayby running the commansudo config container feature autorestart dhcp_relay enabledon DUT. Then we can select a critical process from the commanddocker top dhcp_relayand use the commandsudo kill -SIGKILL <pid>to kill that critical process. Final step is to check whether the container is restarted correctly or not.- Description for the changelog