[docker-engine] fix systemd shutdown hang #2451
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
When rebooting without the platform_reboot plugin, systemd takes a few minutes to properly shutdown. It's blocking on some docker cleanup operation. As described by docker/for-linux#421 there is a race between docker.service and containerd.service. docker needs containerd to properly stop the containers.
This was referenced Jan 16, 2019
|
Made to 201811 branch on 1/16/2019 |
yxieca
pushed a commit
that referenced
this pull request
Jan 16, 2019
When rebooting without the platform_reboot plugin, systemd takes a few minutes to properly shutdown. It's blocking on some docker cleanup operation. As described by docker/for-linux#421 there is a race between docker.service and containerd.service. docker needs containerd to properly stop the containers.
dgsudharsan
added a commit
to dgsudharsan/sonic-buildimage
that referenced
this pull request
Sep 15, 2022
Update sonic-swss submodule pointer to include the following: * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) ([sonic-net#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([sonic-net#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2432](sonic-net/sonic-swss#2432)) Signed-off-by: dgsudharsan <[email protected]>
dgsudharsan
added a commit
to dgsudharsan/sonic-buildimage
that referenced
this pull request
Sep 16, 2022
Update sonic-swss submodule pointer to include the following: * 04ce7be check state_db for po before sending ARP/ND pkts (sonic-net#2444) ([sonic-net#2450](sonic-net/sonic-swss#2450)) * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) ([sonic-net#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([sonic-net#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2432](sonic-net/sonic-swss#2432)) Signed-off-by: dgsudharsan <[email protected]>
dgsudharsan
added a commit
to dgsudharsan/sonic-buildimage
that referenced
this pull request
Sep 21, 2022
Update sonic-swss submodule pointer to include the following: * 8eea92e [202205][counters] Revert PR sonic-net#2432 for the buffer queue/pg counters improvement ([sonic-net#2462](sonic-net/sonic-swss#2462)) * 5d8636a [202205] Enhance orchagent and buffer manager in error handling (sonic-net#2414) ([sonic-net#2449](sonic-net/sonic-swss#2449)) * aa22237 [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392) ([sonic-net#2455](sonic-net/sonic-swss#2455)) * 04ce7be check state_db for po before sending ARP/ND pkts (sonic-net#2444) ([sonic-net#2450](sonic-net/sonic-swss#2450)) * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) ([sonic-net#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([sonic-net#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2432](sonic-net/sonic-swss#2432)) Signed-off-by: dgsudharsan <[email protected]>
prsunny
pushed a commit
that referenced
this pull request
Sep 21, 2022
Update sonic-swss submodule pointer to include the following: * 8eea92e [202205][counters] Revert PR #2432 for the buffer queue/pg counters improvement ([#2462](sonic-net/sonic-swss#2462)) * 5d8636a [202205] Enhance orchagent and buffer manager in error handling (#2414) ([#2449](sonic-net/sonic-swss#2449)) * aa22237 [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (#2392) ([#2455](sonic-net/sonic-swss#2455)) * 04ce7be check state_db for po before sending ARP/ND pkts (#2444) ([#2450](sonic-net/sonic-swss#2450)) * f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (#2431) ([#2451](sonic-net/sonic-swss#2451)) * 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([#2437](sonic-net/sonic-swss#2437)) * 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([#2432](sonic-net/sonic-swss#2432))
stephenxs
added a commit
to stephenxs/sonic-buildimage
that referenced
this pull request
Nov 8, 2022
d5a6da31 Do not configure physical attributes on port channels in portconfig (sonic-net#2456) 48ee7722 Change db_migrator major version on master branch from version 3 to 4 (sonic-net#2470) f3746163 [GCU] Fix JsonPointerFilter bug (sonic-net#2477) 58dbb3e6 YANG Validation for ConfigDB Updates: TACPLUS, TACPLUS_SERVER, AAA, VLAN_SUB_INTERFACE tables + decorated validated_mod_entry (sonic-net#2452) 062f18a0 fix show interface neighbor expected empty issue (sonic-net#2465) 569edf3b Fix display disorder problem of show mirror_session (sonic-net#2447) daaf0ffc Disable "tag as local" when reboot (sonic-net#2451) 6621120b Fix sudo sfputil show error-status on a multiasic platform issue (sonic-net#2373) e8b1dcdf Add IP remove warnings for VRF commands (sonic-net#2351) 40cc8e11 [scripts/generate_dump] add information to tech-support file (sonic-net#2357) 8473517e Revert "[config reload]: On dual ToR systems, cache ARP and FDB table (sonic-net#2460) Signed-off-by: Stephen Sun <[email protected]>
yxieca
pushed a commit
that referenced
this pull request
Nov 11, 2022
#12639) * Advance submodule sonic-utilities d5a6da31 Do not configure physical attributes on port channels in portconfig (#2456) 48ee7722 Change db_migrator major version on master branch from version 3 to 4 (#2470) f3746163 [GCU] Fix JsonPointerFilter bug (#2477) 58dbb3e6 YANG Validation for ConfigDB Updates: TACPLUS, TACPLUS_SERVER, AAA, VLAN_SUB_INTERFACE tables + decorated validated_mod_entry (#2452) 062f18a0 fix show interface neighbor expected empty issue (#2465) 569edf3b Fix display disorder problem of show mirror_session (#2447) daaf0ffc Disable "tag as local" when reboot (#2451) 6621120b Fix sudo sfputil show error-status on a multiasic platform issue (#2373) e8b1dcdf Add IP remove warnings for VRF commands (#2351) 40cc8e11 [scripts/generate_dump] add information to tech-support file (#2357) 8473517e Revert "[config reload]: On dual ToR systems, cache ARP and FDB table (#2460) Signed-off-by: Stephen Sun <[email protected]> * Advance sonic-platform-common aa86083 Fix issue: rounding float value for txpower and rxpower (#320) 2052a63 Fix issue: copper cable should not display DOM information (#318) cf4c6af CmisApi::get_application_advertisement catch AttributeError as well (#316) Signed-off-by: Stephen Sun <[email protected]> Signed-off-by: Stephen Sun <[email protected]>
7 tasks
yxieca
added a commit
to yxieca/sonic-buildimage
that referenced
this pull request
Dec 1, 2022
utilities: * 252910a 2022-11-29 | [drop counters] Fix CLI script for unconfigured PGs (sonic-net#2518) (HEAD -> 202205) [Lior Avramov] * f2bf7ed 2022-11-30 | Change show kube command default value of insecure key to True (sonic-net#2517) [lixiaoyuner] * 0a030ce 2022-12-01 | [QoS] Introduce delay to the qos reload flow (sonic-net#2503) [DavidZagury] * d2fa21c 2022-11-02 | Disable "tag as local" when reboot (sonic-net#2451) [lixiaoyuner] platform-daemon: * 5532070 2022-12-01 | Remove the argument that is causing the xcvrd to crash (sonic-net#318) (HEAD -> 202205) [Vivek] Signed-off-by: Ying Xie <[email protected]>
yxieca
added a commit
that referenced
this pull request
Dec 1, 2022
utilities: * 252910a 2022-11-29 | [drop counters] Fix CLI script for unconfigured PGs (#2518) (HEAD -> 202205) [Lior Avramov] * f2bf7ed 2022-11-30 | Change show kube command default value of insecure key to True (#2517) [lixiaoyuner] * 0a030ce 2022-12-01 | [QoS] Introduce delay to the qos reload flow (#2503) [DavidZagury] * d2fa21c 2022-11-02 | Disable "tag as local" when reboot (#2451) [lixiaoyuner] platform-daemon: * 5532070 2022-12-01 | Remove the argument that is causing the xcvrd to crash (#318) (HEAD -> 202205) [Vivek] Signed-off-by: Ying Xie <[email protected]> Signed-off-by: Ying Xie <[email protected]>
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.
- What I did
Add missing containerd.service to the After= of docker.service
- How to verify it
Run /sbin/reboot on any platform while looking at the console.
Everything should go smoothly and no containerd timeout error should appear in the journal.
- Description for the changelog
When rebooting without the platform_reboot plugin, systemd takes a few
minutes to properly shutdown. It's blocking on some docker cleanup
operation.
As described by docker/for-linux#421 there
is a race between docker.service and containerd.service.
docker needs containerd to properly stop the containers.