Skip to content
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

Revert "[boot] Delay ntp-config service to start after 5 minutes" #2590

Merged
merged 1 commit into from
Feb 21, 2019
Merged

Revert "[boot] Delay ntp-config service to start after 5 minutes" #2590

merged 1 commit into from
Feb 21, 2019

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Feb 19, 2019

Reverts #2494

Turns out that what harmful to supervisord is the ntpd initial jump when ntpd started and received the NTP time the first time.

#2589 addresses the initial jump issue. With that, we would like to have the correct configuration earlier.

@yxieca yxieca requested a review from jleveque February 19, 2019 23:09
@lguohan
Copy link
Collaborator

lguohan commented Feb 20, 2019 •
edited
Loading

there are lots of service unit file has this ntp-config, we need to remove this dependency.

lgh@gulv-vm1:/data2/sonic/stretch/sonic-buildimage$ git grep ntp-config
files/build_templates/bgp.service.j2:Before=ntp-config.service
files/build_templates/dhcp_relay.service.j2:Before=ntp-config.service
files/build_templates/lldp.service.j2:Before=ntp-config.service
files/build_templates/ntp-config.timer:Unit=ntp-config.service
files/build_templates/pmon.service.j2:Before=ntp-config.service
files/build_templates/radv.service.j2:Before=ntp-config.service
files/build_templates/snmp.service.j2:Before=ntp-config.service
files/build_templates/sonic_debian_extension.j2:sudo cp $IMAGE_CONFIGS/ntp/ntp-config.service $FILESYSTEM_ROOT/etc/systemd/system/
files/build_templates/sonic_debian_extension.j2:sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ntp-config.service
files/build_templates/sonic_debian_extension.j2:sudo cp $IMAGE_CONFIGS/ntp/ntp-config.sh $FILESYSTEM_ROOT/usr/bin/
files/build_templates/sonic_debian_extension.j2:sudo cp $BUILD_TEMPLATES/ntp-config.timer $FILESYSTEM_ROOT/etc/systemd/system/
files/build_templates/sonic_debian_extension.j2:sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ntp-config.timer
files/build_templates/swss.service.j2:Before=ntp-config.service
files/build_templates/syncd.service.j2:Before=ntp-config.service
files/build_templates/teamd.service.j2:Before=ntp-config.service
files/build_templates/telemetry.service.j2:Before=ntp-config.service
files/image_config/ntp/ntp-config.service:ExecStart=/usr/bin/ntp-config.sh

lguohan
lguohan previously requested changes Feb 20, 2019
View reviewed changes
Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as comments.

@yxieca
Copy link
Contributor Author

yxieca commented Feb 20, 2019

@lguohan by reverting #2494, we didn't remove ntp-config.service. we only removed the 5 minutes delay.

@yxieca yxieca dismissed lguohan’s stale review February 21, 2019 18:04

ntp-config service is still there. Only 5 minutes delay is gone.

@yxieca yxieca merged commit 3086f4f into master Feb 21, 2019
@yxieca yxieca deleted the revert-2494-delay_ntp branch February 21, 2019 18:04
@yxieca
Copy link
Contributor Author

yxieca commented Feb 21, 2019

Made to 201811 branch on 2/21/2019

yxieca added a commit that referenced this pull request Feb 21, 2019
@yxieca
Revert "[baseimage] Delay ntp-config service to start after 5 minutes (…
d5250ad 
…#2494)" (#2590)

This reverts commit 33fe8d2.
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
Revert "[baseimage] Delay ntp-config service to start after 5 minutes (…
5a0f477 
…sonic-net#2494)" (sonic-net#2590)

This reverts commit 33fe8d2.
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
Revert "[baseimage] Delay ntp-config service to start after 5 minutes (…
b9e2740 
…sonic-net#2494)" (sonic-net#2590)

This reverts commit 33fe8d2.
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
Revert "[baseimage] Delay ntp-config service to start after 5 minutes (…
1b31645 
…sonic-net#2494)" (sonic-net#2590)

This reverts commit 33fe8d2.
@yxieca yxieca mentioned this pull request Jan 4, 2023
Merged
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Jan 5, 2023
@yxieca
[202205][linkmgrd][utilities][swss][swss-common][platform-daemons][pl…
ed92929 
…atform-common][py-swsssdk] advance submodule head

linkmgrd:
* bf75a93 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#157) (HEAD -> 202205, github/202205) [Liu Shilong]

utilities:
* c1fa31d 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2530) (HEAD -> 202205) [Liu Shilong]
* 9990208 2022-05-19 | Add sonic-delayed.target to Application Extension .timer file generator (sonic-net#2176) [noaOrMlnx]

swss:
* 7b3170a 2023-01-05 | Revert "sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552)" (HEAD -> 202205) [Ying Xie]
* 4897e93 2023-01-05 | Revert "[bufferorch] : Support for buffer profiles for VoQ on chassis (sonic-net#2465)" (HEAD -> 202205, github/202205) [Ying Xie]
* bbccc68 2023-01-04 | [vstest] Only collect stdout of orchagent_restart_check in vstest (sonic-net#2597) (HEAD -> 202205, github/202205) [bingwang-ms]
* f7a7c05 2023-01-04 | Avoid aborting orchagent when setting TUNNEL attributes (sonic-net#2591) [Stephen Sun]
* 84064fa 2022-12-20 | Fixed a bug causing error state of same configuration is applied twice. (sonic-net#2580) [siqbal1986]
* 4851bef 2022-12-20 | Only collect stdout of orchagent_restart_check in vstest (sonic-net#2578) [bingwang-ms]
* 2904d95 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552) [Sambath Kumar Balasubramanian]
* ac84e41 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2546) [Liu Shilong]
* 502bd69 2022-12-20 | Fix `test_vlan.py` (sonic-net#2541) [Longxiang Lyu]
* 1e37d0e 2022-12-19 | [voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522) [jfeng-arista]
* 17cdad3 2022-12-20 | [bufferorch] : Support for buffer profiles for VoQ on chassis (sonic-net#2465) [vmittal-msft]
* 5345338 2023-01-04 | Disable `arp_evict_nocarrier` for vlan host intf  (sonic-net#2590) [Longxiang Lyu]

swss-common:
* 9616287 2023-01-04 | Added customer monitoring  tables in app db and state db (sonic-net#725) (HEAD -> 202205) [siqbal1986]
* d03b95d 2022-11-30 |  Use github code scanning instead of LGTM (sonic-net#718) [Liu Shilong]
* 8a276c6 2022-12-28 | Fix sonic-slave docker image environment issue. (sonic-net#728) (github/202205) [Liu Shilong]
* 8fee1b4 2022-11-14 | Fix memory leak issue in ConfigDBConnector. (sonic-net#655) (sonic-net#706) [Hua Liu]

sairedis:
* 5387602 2022-11-30 | Use github code scanning instead of LGTM (#1160) (HEAD -> 202205) [Liu Shilong]

platform-daemons:
* b499412 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#316) (HEAD -> 202205, github/202205) [Liu Shilong]

platform-common:
* d11e983 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#328) (HEAD -> 202205) [Liu Shilong]

py-swsssdk:
* b654e91 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#131) (HEAD -> 202205) [Liu Shilong]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Jan 5, 2023
@yxieca
[202205][linkmgrd][utilities][swss][swss-common][platform-daemons][pl…
3f51143 
…atform-common][py-swsssdk] advance submodule head (#13260)

linkmgrd:
* bf75a93 2022-11-30 | Use github code scanning instead of LGTM (#157) (HEAD -> 202205, github/202205) [Liu Shilong]

utilities:
* c1fa31d 2022-11-30 | Use github code scanning instead of LGTM (#2530) (HEAD -> 202205) [Liu Shilong]
* 9990208 2022-05-19 | Add sonic-delayed.target to Application Extension .timer file generator (#2176) [noaOrMlnx]

swss:
* bbccc68 2023-01-04 | [vstest] Only collect stdout of orchagent_restart_check in vstest (#2597) (HEAD -> 202205, github/202205) [bingwang-ms]
* f7a7c05 2023-01-04 | Avoid aborting orchagent when setting TUNNEL attributes (#2591) [Stephen Sun]
* 84064fa 2022-12-20 | Fixed a bug causing error state of same configuration is applied twice. (#2580) [siqbal1986]
* 4851bef 2022-12-20 | Only collect stdout of orchagent_restart_check in vstest (#2578) [bingwang-ms]
* 2904d95 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (#2552) [Sambath Kumar Balasubramanian]
* ac84e41 2022-11-30 | Use github code scanning instead of LGTM (#2546) [Liu Shilong]
* 502bd69 2022-12-20 | Fix `test_vlan.py` (#2541) [Longxiang Lyu]
* 1e37d0e 2022-12-19 | [voq][chassis]Add show fabric counters port/queue commands (#2522) [jfeng-arista]
* 17cdad3 2022-12-20 | [bufferorch] : Support for buffer profiles for VoQ on chassis (#2465) [vmittal-msft]
* 5345338 2023-01-04 | Disable `arp_evict_nocarrier` for vlan host intf  (#2590) [Longxiang Lyu]

swss-common:
* 9616287 2023-01-04 | Added customer monitoring  tables in app db and state db (#725) (HEAD -> 202205) [siqbal1986]
* d03b95d 2022-11-30 |  Use github code scanning instead of LGTM (#718) [Liu Shilong]
* 8a276c6 2022-12-28 | Fix sonic-slave docker image environment issue. (#728) (github/202205) [Liu Shilong]
* 8fee1b4 2022-11-14 | Fix memory leak issue in ConfigDBConnector. (#655) (#706) [Hua Liu]

sairedis:
* 5387602 2022-11-30 | Use github code scanning instead of LGTM (#1160) (HEAD -> 202205) [Liu Shilong]

platform-daemons:
* b499412 2022-11-30 | Use github code scanning instead of LGTM (#316) (HEAD -> 202205, github/202205) [Liu Shilong]

platform-common:
* d11e983 2022-11-30 | Use github code scanning instead of LGTM (#328) (HEAD -> 202205) [Liu Shilong]

py-swsssdk:
* b654e91 2022-11-30 | Use github code scanning instead of LGTM (#131) (HEAD -> 202205) [Liu Shilong]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

@lguohan lguohan lguohan left review comments

Assignees
No one assigned
Labels
Included in 201811 Branch Request for 201811 Branch :shipit:
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yxieca @lguohan @jleveque