Skip to content

[boot] Refactor: All services which start Docker containers start before ntp-config service #2335

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

Jump to bottom
Merged
merged 1 commit into from
Dec 4, 2018
Merged

[boot] Refactor: All services which start Docker containers start before ntp-config service #2335

merged 1 commit into from
Dec 4, 2018

Conversation

jleveque
Copy link
Contributor

@jleveque jleveque commented Dec 3, 2018 •
edited
Loading

This PR inverts the logic of #2303 for a cleaner approach. Each service which starts a Docker container specifies that it should be started before ntp-config, rather than specifying that ntp-config.service should be started after multiple services.

@jleveque jleveque self-assigned this Dec 3, 2018
@jleveque jleveque requested review from lguohan and taoyl-ms December 3, 2018 20:45
@lguohan
Copy link
Collaborator

lguohan commented Dec 3, 2018

in long team, we still need to have monotonic clock into supervisor. If supervisord is not willing to do it, we should do it ourselves. @jleveque

@nikos-github
Copy link
Collaborator

Will ntp be blocked if the service that starts a container errors out or doesn't start?

@jleveque
Copy link
Contributor Author

jleveque commented Dec 3, 2018

@nikos-github: No. The dependency uses After=, which is an order-only dependency. If one of the other services fails to start, ntp-config will still be started. The behavior you ask about would occur if we instead used the Requires= dependency.

@jleveque jleveque merged commit 298d2ad into sonic-net:master Dec 4, 2018
@jleveque jleveque deleted the before_ntp branch December 4, 2018 00:01
@jleveque jleveque mentioned this pull request Jan 28, 2019
Merged
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Jul 7, 2022
@dprital
[submodule] Update sonic-swss submodule
2a793ff 
Update sonic-swss submodule pointer to include the following:
* Port configuration incremental update support ([sonic-net#2305](sonic-net/sonic-swss#2305))
* [VS Test] Skip failing subport tests ([sonic-net#2370](sonic-net/sonic-swss#2370))
* [teammgr]: Waiting MACsec ready before doLagMemberTask ([sonic-net#2286](sonic-net/sonic-swss#2286))
* [vnetorch] [vxlanorch] fix a set of memory usage issues ([sonic-net#2352](sonic-net/sonic-swss#2352))
* [tests] [asan] add graceful stop flag ([sonic-net#2347](sonic-net/sonic-swss#2347))
* [asan] suppress the static variable leaks ([sonic-net#2354](sonic-net/sonic-swss#2354))
* Add support for IP interface loopback action ([sonic-net#2307](sonic-net/sonic-swss#2307))
* [orchagent]: srv6orch support for uSID ([sonic-net#2335](sonic-net/sonic-swss#2335))

Signed-off-by: dprital <[email protected]>
liat-grozovik pushed a commit that referenced this pull request Jul 14, 2022
@dprital
[submodule] Advance sonic-swss pointer (#11380)
054b4bd 
Update sonic-swss submodule pointer to include the following:
* Port configuration incremental update support ([#2305](sonic-net/sonic-swss#2305))
* [VS Test] Skip failing subport tests ([#2370](sonic-net/sonic-swss#2370))
* [teammgr]: Waiting MACsec ready before doLagMemberTask ([#2286](sonic-net/sonic-swss#2286))
* [vnetorch] [vxlanorch] fix a set of memory usage issues ([#2352](sonic-net/sonic-swss#2352))
* [tests] [asan] add graceful stop flag ([#2347](sonic-net/sonic-swss#2347))
* [asan] suppress the static variable leaks ([#2354](sonic-net/sonic-swss#2354))
* Add support for IP interface loopback action ([#2307](sonic-net/sonic-swss#2307))
* [orchagent]: srv6orch support for uSID ([#2335](sonic-net/sonic-swss#2335))

Signed-off-by: dprital <[email protected]>
vivekrnv pushed a commit to vivekrnv/sonic-buildimage that referenced this pull request Aug 26, 2022
@svshah-intel
[orchagent]: srv6orch support for uSID (sonic-net#2335)
fe875fd 
* [orchagent]: srv6orch support for uSID
@yxieca yxieca mentioned this pull request Sep 8, 2022
Merged
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Sep 9, 2022
@yxieca
[202205][linkmgrd][utilities][platform-daemons][platform-common][linu…
4bc2354 
…x-kernel] advance submodule head

linkmgrd:
* ab5b2c1 2022-09-02 | Fix mux config (sonic-net#128) (HEAD -> 202205, github/202205) [Longxiang Lyu]

utilities:
* 7de9305 2022-09-07 | [generate dump]Added error message when saisdkdump fails (sonic-net#2356) (HEAD -> 202205, github/202205) [Sudharsan Dhamal Gopalarathnam]
* c5b0a6d 2022-09-07 | [counterpoll]Fixing counterpoll show for tunnel and acl stats (sonic-net#2355) [Sudharsan Dhamal Gopalarathnam]
* 1452b44 2022-09-05 | [GCU] Fix missing backend in dry run (sonic-net#2347) [jingwenxie]
* bc7b845 2022-09-04 | Add Password Hardening CLI support (sonic-net#2338) [davidpil2002]
* 55e8948 2022-09-06 | [fast-reboot]Avoid stopping masked services during fast-reboot (sonic-net#2335) [Sudharsan Dhamal Gopalarathnam]
* f7d69d4 2022-08-30 | Replace cmp in acl_loader with operator.eq (sonic-net#2328) [Zhaohui Sun]
* 4054ebb 2022-09-05 | Add verification for override (sonic-net#2305) [jingwenxie]
* 729d811 2022-05-30 | Fix sonic-installer and 'show version' command crash when database docker not running issue. (sonic-net#2183) [Hua Liu]

platform-daemons:
* 36ba7c0 2022-09-07 | [ycable] cleanup logic for creating grpc future ready (sonic-net#289) (HEAD -> 202205) [vdahiya12]
* 2a9db73 2022-09-01 | [ycabled] fix insert events from xcvrd;cleanup some mux toggle logic (sonic-net#287) [vdahiya12]

platform-common:
* d7c990d 2022-09-03 | [CMIS] 'get_transceiver_info' should return 'None' when CMIS cable EEPROM is not ready  (sonic-net#305) (HEAD -> 202205) [Kebo Liu]

linux-kernel:
* 25ea052 2022-08-31 | [patch]: Add accpt_untracked_na kernel param (sonic-net#292) (HEAD -> 202205) [Lawrence Lee]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Sep 10, 2022
@yxieca
[202205][linkmgrd][utilities][platform-daemons][platform-common][linu…
6812cf0 
…x-kernel] advance submodule head (#12025)

linkmgrd:
* ab5b2c1 2022-09-02 | Fix mux config (#128) (HEAD -> 202205, github/202205) [Longxiang Lyu]

utilities:
* 7de9305 2022-09-07 | [generate dump]Added error message when saisdkdump fails (#2356) (HEAD -> 202205, github/202205) [Sudharsan Dhamal Gopalarathnam]
* c5b0a6d 2022-09-07 | [counterpoll]Fixing counterpoll show for tunnel and acl stats (#2355) [Sudharsan Dhamal Gopalarathnam]
* 1452b44 2022-09-05 | [GCU] Fix missing backend in dry run (#2347) [jingwenxie]
* bc7b845 2022-09-04 | Add Password Hardening CLI support (#2338) [davidpil2002]
* 55e8948 2022-09-06 | [fast-reboot]Avoid stopping masked services during fast-reboot (#2335) [Sudharsan Dhamal Gopalarathnam]
* f7d69d4 2022-08-30 | Replace cmp in acl_loader with operator.eq (#2328) [Zhaohui Sun]
* 4054ebb 2022-09-05 | Add verification for override (#2305) [jingwenxie]
* 729d811 2022-05-30 | Fix sonic-installer and 'show version' command crash when database docker not running issue. (#2183) [Hua Liu]

platform-daemons:
* 36ba7c0 2022-09-07 | [ycable] cleanup logic for creating grpc future ready (#289) (HEAD -> 202205) [vdahiya12]
* 2a9db73 2022-09-01 | [ycabled] fix insert events from xcvrd;cleanup some mux toggle logic (#287) [vdahiya12]

platform-common:
* d7c990d 2022-09-03 | [CMIS] 'get_transceiver_info' should return 'None' when CMIS cable EEPROM is not ready  (#305) (HEAD -> 202205) [Kebo Liu]

linux-kernel:
* 25ea052 2022-08-31 | [patch]: Add accpt_untracked_na kernel param (#292) (HEAD -> 202205) [Lawrence Lee]

Signed-off-by: Ying Xie <[email protected]>

Signed-off-by: Ying Xie <[email protected]>
dgsudharsan added a commit to dgsudharsan/sonic-buildimage that referenced this pull request Sep 14, 2022
@dgsudharsan
[submodule] Update sonic-utilities submodule
489aee6 
Update sonic-utilities submodule pointer to include the following:
* 4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands ([sonic-net#2345](sonic-net/sonic-utilities#2345))
* bbcdf2e disk_check: Publish event  for RO state ([sonic-net#2320](sonic-net/sonic-utilities#2320))
* 3fd537b Support the bandit check by GitHub Action ([sonic-net#2358](sonic-net/sonic-utilities#2358))
* 491d3d3 [generate dump]Added error message when saisdkdump fails ([sonic-net#2356](sonic-net/sonic-utilities#2356))
* 6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats ([sonic-net#2355](sonic-net/sonic-utilities#2355))
* 3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot ([sonic-net#2335](sonic-net/sonic-utilities#2335))
* 0e1b0cf [GCU] Fix missing backend in dry run ([sonic-net#2347](sonic-net/sonic-utilities#2347))
* 676c31b Add verification for override ([sonic-net#2305](sonic-net/sonic-utilities#2305))
* 48997c2 Add Password Hardening CLI support ([sonic-net#2338](sonic-net/sonic-utilities#2338))
* 414e239 update unit tests for swap ([#locato](https://github.com/Azure/sonic-utilities/pull/locato))
* a91a492 consider swap checking memory in ([#stalle](https://github.com/Azure/sonic-utilities/pull/stalle))
* f0ce586 [route_check]: Ignore standalone tunnel routes ([sonic-net#2325](sonic-net/sonic-utilities#2325))

Signed-off-by: dgsudharsan <[email protected]>
@wen587 wen587 mentioned this pull request Sep 21, 2022
Merged
7 tasks
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Sep 21, 2022
@dprital
[submodule] Advance sonic-utilities pointer
e838a23 
Update sonic-utilities submodule pointer to include the following:
* 0a7557b [minigraph] add option to specify golden path in load_minigraph ([sonic-net#2350](sonic-net/sonic-utilities#2350))
* 322aefc [GCU]Remove GCU unique lane check for duplicate lanes platforms ([sonic-net#2343](sonic-net/sonic-utilities#2343))
* 7099fff [fastboot] fastboot enhancement: Use warm-boot infrastructure for fast-boot ([sonic-net#2286](sonic-net/sonic-utilities#2286))
* 09026ed [warm-reboot] fix warm-reboot when /tmp/cache is missing ([sonic-net#2367](sonic-net/sonic-utilities#2367))
* a3c404c Fix typo in platform_sfputil_helper.is_rj45_port ([sonic-net#2374](sonic-net/sonic-utilities#2374))
* 637d834 Vnet_route_check Vxlan tunnel route update. ([sonic-net#2281](sonic-net/sonic-utilities#2281))
* 29a3e51 Added support for tunnel route status in show vnet routes all. ([sonic-net#2341](sonic-net/sonic-utilities#2341))
* 1ac584b Use 'default' VRF when VRF name is not provided ([sonic-net#2368](sonic-net/sonic-utilities#2368))
* 4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands ([sonic-net#2345](sonic-net/sonic-utilities#2345))
* bbcdf2e disk_check: Publish event  for RO state ([sonic-net#2320](sonic-net/sonic-utilities#2320))
* 3fd537b Support the bandit check by GitHub Action ([sonic-net#2358](sonic-net/sonic-utilities#2358))
* 491d3d3 [generate dump]Added error message when saisdkdump fails ([sonic-net#2356](sonic-net/sonic-utilities#2356))
* 6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats ([sonic-net#2355](sonic-net/sonic-utilities#2355))
* 3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot ([sonic-net#2335](sonic-net/sonic-utilities#2335))
* 0e1b0cf [GCU] Fix missing backend in dry run ([sonic-net#2347](sonic-net/sonic-utilities#2347))
* 676c31b Add verification for override ([sonic-net#2305](sonic-net/sonic-utilities#2305))
* 48997c2 Add Password Hardening CLI support ([sonic-net#2338](sonic-net/sonic-utilities#2338))
* 414e239 update unit tests for swap ([#locato](https://github.com/sonic-net/sonic-utilities/pull/locato))
* a91a492 consider swap checking memory in ([#stalle](https://github.com/sonic-net/sonic-utilities/pull/stalle))
* f0ce586 [route_check]: Ignore standalone tunnel routes ([sonic-net#2325](sonic-net/sonic-utilities#2325))

Signed-off-by: dprital <[email protected]>
@wen587 wen587 mentioned this pull request Sep 23, 2022
Closed
7 tasks
qiluo-msft pushed a commit that referenced this pull request Oct 1, 2022
@wen587
[submodule] update sonic-utilities (#12138)
0a2743d 
0a7557b [minigraph] add option to specify golden path in load_minigraph (#2350)
322aefc [GCU]Remove GCU unique lane check for duplicate lanes platforms (#2343)
7099fff [fastboot] fastboot enhancement: Use warm-boot infrastructure for fast-boot (#2286)
09026ed [warm-reboot] fix warm-reboot when /tmp/cache is missing (#2367)
a3c404c Fix typo in platform_sfputil_helper.is_rj45_port (#2374)
637d834 Vnet_route_check Vxlan tunnel route update. (#2281)
29a3e51 Added support for tunnel route status in show vnet routes all. (#2341)
1ac584b Use 'default' VRF when VRF name is not provided (#2368)
4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands (#2345)
bbcdf2e disk_check: Publish event  for RO state (#2320)
3fd537b Support the bandit check by GitHub Action (#2358)
491d3d3 [generate dump]Added error message when saisdkdump fails (#2356)
6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats (#2355)
3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot (#2335)
0e1b0cf [GCU] Fix missing backend in dry run (#2347)
676c31b Add verification for override (#2305)
48997c2 Add Password Hardening CLI support (#2338)
414e239 update unit tests for swap allocator
a91a492 consider swap checking memory in installer
f0ce586 [route_check]: Ignore standalone tunnel routes (#2325)
vadymhlushko-mlnx pushed a commit to vadymhlushko-mlnx/sonic-buildimage that referenced this pull request Nov 11, 2022
@dgsudharsan
[fast-reboot]Avoid stopping masked services during fast-reboot (sonic…
3be2ad7 
…-net#2335)

#### What I did
During fast-reboot there were warnings for few services
sudo fast-reboot
Warning: The unit file, source configuration file or drop-ins of mux.service changed on disk. Run 'systemctl daemon-reload' to reload units.
Dumping conntrack entries failed
Warning: The unit file, source configuration file or drop-ins of nat.service changed on disk. Run 'systemctl daemon-reload' to reload units.
Warning: The unit file, source configuration file or drop-ins of sflow.service changed on disk. Run 'systemctl daemon-reload' to reload units.
Warning: Stopping docker.service, but it can still be activated by:
docker.socket
Watchdog armed for 180 seconds

This is due to the fact that the services are masked and trying to stop them will throw warning

systemctl is-enabled sflow.service
masked
systemctl stop sflow.service
Warning: The unit file, source configuration file or drop-ins of sflow.service changed on disk. Run 'systemctl daemon-reload' to reload units.


#### How I did it
Added check to skip stopping the services in fast-reboot if the services are masked.


#### How to verify it
Execute fast-reboot with the fix and verify.
richardyu-ms pushed a commit to richardyu-ms/sonic-buildimage that referenced this pull request Nov 16, 2022
@yxieca
Merged PR 6880849: Manual merge github master to internal branch
2b16e56 
Related work items: sonic-net#2151, sonic-net#2194, sonic-net#2224, sonic-net#2237, sonic-net#2264, sonic-net#2281, sonic-net#2286, sonic-net#2297, sonic-net#2299, sonic-net#2305, sonic-net#2325, sonic-net#2335, sonic-net#2338, sonic-net#2341, sonic-net#2343, sonic-net#2347, sonic-net#2350, sonic-net#2355, sonic-net#2356, sonic-net#2358, sonic-net#2360, sonic-net#2363, sonic-net#2367, sonic-net#2368, sonic-net#2370, sonic-net#2374, sonic-net#2392, sonic-net#2398, sonic-net#2408, sonic-net#2414, sonic-net#2415, sonic-net#2419, sonic-net#2421, sonic-net#2422, sonic-net#2423, sonic-net#2426, sonic-net#2427, sonic-net#2430, sonic-net#2431, sonic-net#2433, sonic-net#2434, sonic-net#2436, sonic-net#2437, sonic-net#2441, sonic-net#2444, sonic-net#2445, sonic-net#2446, sonic-net#2456, sonic-net#2458, sonic-net#2460, sonic-net#2461, sonic-net#2463, sonic-net#2472, sonic-net#2475, sonic-net#11877, sonic-net#12024, sonic-net#12065, sonic-net#12097, sonic-net#12130, sonic-net#12209, sonic-net#12217, sonic-net#12244, sonic-net#12251, sonic-net#12255, sonic-net#12276, sonic-net#12284
roberthong-qct pushed a commit to QuantaSwitch/sonic-buildimage that referenced this pull request Nov 18, 2022
@wen587 @roberthong-qct
[submodule] update sonic-utilities (sonic-net#12138)
0b1527a 
0a7557b [minigraph] add option to specify golden path in load_minigraph (sonic-net#2350)
322aefc [GCU]Remove GCU unique lane check for duplicate lanes platforms (sonic-net#2343)
7099fff [fastboot] fastboot enhancement: Use warm-boot infrastructure for fast-boot (sonic-net#2286)
09026ed [warm-reboot] fix warm-reboot when /tmp/cache is missing (sonic-net#2367)
a3c404c Fix typo in platform_sfputil_helper.is_rj45_port (sonic-net#2374)
637d834 Vnet_route_check Vxlan tunnel route update. (sonic-net#2281)
29a3e51 Added support for tunnel route status in show vnet routes all. (sonic-net#2341)
1ac584b Use 'default' VRF when VRF name is not provided (sonic-net#2368)
4d377a6 [subinterface]Added additional checks in portchannel and subinterface commands (sonic-net#2345)
bbcdf2e disk_check: Publish event  for RO state (sonic-net#2320)
3fd537b Support the bandit check by GitHub Action (sonic-net#2358)
491d3d3 [generate dump]Added error message when saisdkdump fails (sonic-net#2356)
6830e01 [counterpoll]Fixing counterpoll show for tunnel and acl stats (sonic-net#2355)
3be2ad7 [fast-reboot]Avoid stopping masked services during fast-reboot (sonic-net#2335)
0e1b0cf [GCU] Fix missing backend in dry run (sonic-net#2347)
676c31b Add verification for override (sonic-net#2305)
48997c2 Add Password Hardening CLI support (sonic-net#2338)
414e239 update unit tests for swap allocator
a91a492 consider swap checking memory in installer
f0ce586 [route_check]: Ignore standalone tunnel routes (sonic-net#2325)
@aravindmani-1 aravindmani-1 mentioned this pull request Nov 18, 2022
Merged
7 tasks
saiarcot895 added a commit to saiarcot895/sonic-buildimage that referenced this pull request Oct 14, 2024
@saiarcot895
Revert "[boot] Refactor: All services which start Docker containers s…
74b0084 
…tart before ntp-config service (sonic-net#2335)"

Supervisor now handles the case where the time jumps back, now that
Supervisor/supervisor#1047 has been merged.

This reverts commit 298d2ad.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

@taoyl-ms taoyl-ms taoyl-ms approved these changes

Assignees

@jleveque jleveque

Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jleveque @lguohan @nikos-github @taoyl-ms