-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
[ntp] disable ntp time jump #2589
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if it is more explicit and easier to track if rather than removing the ntp-config timer-related stuff here, we instead open a separate PR to revert #2494.
- removing -g to disable jump when time difference is greater than 1000s - add -x to disable initial jump
Joe, I agree with you. Reverting the original PR is a cleaner way of managing git history. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nikos-github the problem is that when ntpd is running without -x option, it is allowed to make a clock adjustment when it first connected to a NTP server. Which could result in dialing back the clock by x amount of time. If supervisord is starting a process when this happens, supervisord would barf. -g allows ntpd to dial clock back/forth when the difference is greater than 1000 seconds. We thought that could cause same supervisord issue. |
@yxieca @lguohan This is like the 4th PR to change something else in order to address the supervisord shortcomings with the clock adjusting. Not allowing the clock to jump, means that the clock is not synchronized for a large period of time. I really don't understand how it is an acceptable solution to have the clock drift like that especially since it can take hours or even days to catch up. This isn't the right way to address the issue at supervisord and we discussed this before. And yet here we are 4 PRs later. |
@nikos-github Acknowledge. I agree that we are trying to work-around known issues with these changes. We would like to see supervisord bug get fixed too. But until then, we would rather like not triggering the issue :-) |
@yxieca Have you tested with your changes to see how long it takes for the clock to synchronize if the difference is 1000s of seconds? |
@nikos-github from what I observed, the clock fixing rate is about 70 seconds every 24 hours. |
Made to 201811 branch on 2/21/2019 |
- removing -g to disable jump when time difference is greater than 1000s - add -x to disable initial jump
- removing -g to disable jump when time difference is greater than 1000s - add -x to disable initial jump
- removing -g to disable jump when time difference is greater than 1000s - add -x to disable initial jump
- removing -g to disable jump when time difference is greater than 1000s - add -x to disable initial jump
The ntpd process will exit silently with "-x" startup option when the current system time is drifted too far from the ntp server's time (> 1000 seconds). The option was introduced to workaround the supervisord issue which was fixed: sonic-net#2624 We are reverting the change to use "-g" option for ntpd process: Revert "[ntp] disable ntp time jump (sonic-net#2589)" This reverts commit a57cb14. Signed-off-by: Zhenggen Xu <zxu@linkedin.com> RB=2010953 G=lnos-reviewers R=pchaudhary,pmao,vapatil,samaity,zxu A=
…le head utilties: * 7fc3fb7 2023-01-06 | [storyteller] add link prober state change to story teller (sonic-net#2585) (HEAD -> 202205, github/202205) [Jing Zhang] * d8202e8 2023-01-12 | [202205] Added a new option in show queue counters command to display voq statistics (sonic-net#2591) [Sambath Kumar Balasubramanian] * 98dde31 2023-01-11 | resolved conflicts (sonic-net#2589) [kannankvs] swss: * 268c3f3 2023-01-11 | Added new attributes for Vnet and Vxlan ecmp configurations. (sonic-net#2584) (HEAD -> 202205, github/202205) [siqbal1986] * 50235b6 2023-01-12 | [routesync] Fix for stale dynamic neighbor (sonic-net#2553) [vganesan-nokia] * ad9d826 2023-01-12 | [202205][voq] Add voq counters. (sonic-net#2606) [Sambath Kumar Balasubramanian] * 34995f1 2023-01-10 | Revert "[voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522)" (sonic-net#2612) [Arvindsrinivasan Lakshmi Narasimhan] sairedis: * 92e6442 2023-01-05 | enable cisco8000 SAI bulk API feature (sonic-net#1153) (sonic-net#1164) (github/202205) [Keith Lu] platform-daemons: * 10eb2e6 2023-01-06 | Fix bug where transceiver info is missing after port breakout change (sonic-net#329) (HEAD -> 202205) [Tal Berlowitz] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…le head (#13353) utilties: * 7fc3fb7 2023-01-06 | [storyteller] add link prober state change to story teller (#2585) (HEAD -> 202205, github/202205) [Jing Zhang] * d8202e8 2023-01-12 | [202205] Added a new option in show queue counters command to display voq statistics (#2591) [Sambath Kumar Balasubramanian] * 98dde31 2023-01-11 | resolved conflicts (#2589) [kannankvs] swss: * 268c3f3 2023-01-11 | Added new attributes for Vnet and Vxlan ecmp configurations. (#2584) (HEAD -> 202205, github/202205) [siqbal1986] * 50235b6 2023-01-12 | [routesync] Fix for stale dynamic neighbor (#2553) [vganesan-nokia] * ad9d826 2023-01-12 | [202205][voq] Add voq counters. (#2606) [Sambath Kumar Balasubramanian] * 34995f1 2023-01-10 | Revert "[voq][chassis]Add show fabric counters port/queue commands (#2522)" (#2612) [Arvindsrinivasan Lakshmi Narasimhan] sairedis: * 92e6442 2023-01-05 | enable cisco8000 SAI bulk API feature (#1153) (#1164) (github/202205) [Keith Lu] platform-daemons: * 10eb2e6 2023-01-06 | Fix bug where transceiver info is missing after port breakout change (#329) (HEAD -> 202205) [Tal Berlowitz] Signed-off-by: Ying Xie <ying.xie@microsoft.com> Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Update sonic-swss submodule pointer to include the following: * a2a483d [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME ([sonic-net#2617](sonic-net/sonic-swss#2617)) * 9d1f66b [bfdorch] add local discriminator to state DB ([sonic-net#2629](sonic-net/sonic-swss#2629)) * c54b3d1 Vxlan tunnel endpoint custom monitoring APPL DB table. ([sonic-net#2589](sonic-net/sonic-swss#2589)) * 7f03db2 Fix potential risks ([sonic-net#2516](sonic-net/sonic-swss#2516)) * 383ee68 [refactor]Refactoring sai handle status ([sonic-net#2621](sonic-net/sonic-swss#2621)) * cd95972 Fix issue 13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([sonic-net#2619](sonic-net/sonic-swss#2619)) * a01470f Remove TODO comments that are no longer relevant ([sonic-net#2622](sonic-net/sonic-swss#2622)) * d058390 Changed the BFD default detect multiplier to 10x ([sonic-net#2614](sonic-net/sonic-swss#2614)) * d78b528 [MuxOrch] Enabling neighbor when adding in active state ([sonic-net#2601](sonic-net/sonic-swss#2601)) * 4ebdad1 [routesync] Fix for stale dynamic neighbor ([sonic-net#2553](sonic-net/sonic-swss#2553)) * 8857f92 Added new attributes for Vnet and Vxlan ecmp configurations. ([sonic-net#2584](sonic-net/sonic-swss#2584)) * b6bbc3e Revert [voq][chassis]Add show fabric counters port/queue commands (2522) ([sonic-net#2611](sonic-net/sonic-swss#2611)) * 52406e2 Add missing parameter to on_switch_shutdown_request method. ([sonic-net#2567](sonic-net/sonic-swss#2567)) * 4ac9ad9 Increase diff coverage to 80% ([sonic-net#2599](sonic-net/sonic-swss#2599)) * 8a0bb36 Handle Mac address 'none' ([sonic-net#2593](sonic-net/sonic-swss#2593)) * f496ab3 [vstest] Only collect stdout of orchagent_restart_check in vstest ([sonic-net#2597](sonic-net/sonic-swss#2597)) * 1dab495 Avoid aborting orchagent when setting TUNNEL attributes ([sonic-net#2591](sonic-net/sonic-swss#2591)) * 4395cea Fix neighbor doesn't update all attribute ([sonic-net#2577](sonic-net/sonic-swss#2577)) Signed-off-by: dprital <drorp@nvidia.com>
Update sonic-swss submodule pointer to include the following: * a2a483d [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME ([#2617](sonic-net/sonic-swss#2617)) * 9d1f66b [bfdorch] add local discriminator to state DB ([#2629](sonic-net/sonic-swss#2629)) * c54b3d1 Vxlan tunnel endpoint custom monitoring APPL DB table. ([#2589](sonic-net/sonic-swss#2589)) * 7f03db2 Fix potential risks ([#2516](sonic-net/sonic-swss#2516)) * 383ee68 [refactor]Refactoring sai handle status ([#2621](sonic-net/sonic-swss#2621)) * cd95972 Fix issue 13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([#2619](sonic-net/sonic-swss#2619)) * a01470f Remove TODO comments that are no longer relevant ([#2622](sonic-net/sonic-swss#2622)) * d058390 Changed the BFD default detect multiplier to 10x ([#2614](sonic-net/sonic-swss#2614)) * d78b528 [MuxOrch] Enabling neighbor when adding in active state ([#2601](sonic-net/sonic-swss#2601)) * 4ebdad1 [routesync] Fix for stale dynamic neighbor ([#2553](sonic-net/sonic-swss#2553)) * 8857f92 Added new attributes for Vnet and Vxlan ecmp configurations. ([#2584](sonic-net/sonic-swss#2584)) * b6bbc3e Revert [voq][chassis]Add show fabric counters port/queue commands (2522) ([#2611](sonic-net/sonic-swss#2611)) * 52406e2 Add missing parameter to on_switch_shutdown_request method. ([#2567](sonic-net/sonic-swss#2567)) * 4ac9ad9 Increase diff coverage to 80% ([#2599](sonic-net/sonic-swss#2599)) * 8a0bb36 Handle Mac address 'none' ([#2593](sonic-net/sonic-swss#2593)) * f496ab3 [vstest] Only collect stdout of orchagent_restart_check in vstest ([#2597](sonic-net/sonic-swss#2597)) * 1dab495 Avoid aborting orchagent when setting TUNNEL attributes ([#2591](sonic-net/sonic-swss#2591)) * 4395cea Fix neighbor doesn't update all attribute ([#2577](sonic-net/sonic-swss#2577)) Signed-off-by: dprital <drorp@nvidia.com>
…e submodule head swss: * 79223f0 2023-01-25 | [bfdorch] add local discriminator to state DB (sonic-net#2629) (HEAD -> 202205) [Baorong Liu] * 64940d4 2023-01-25 | Vxlan tunnel endpoint custom monitoring APPL DB table. (sonic-net#2589) [siqbal1986] * 0930529 2023-02-02 | Merge pull request sonic-net#2650 from devpatha/202205 (github/202205) [Kevin Wang] * 8f5884f 2023-02-01 | Remove counters for Mux ACL [Devesh P Pathak] utilities: * 557adfcc 2023-02-01 | show logging CLI support for logs stored in tmpfs (sonic-net#2641) (HEAD -> 202205) [mihirpat1] * 28d7bb26 2023-01-31 | Making 'show feature autorestart' more resilient to missing auto_restart config in CONFIG_DB (sonic-net#2592) [kartik-arista] * e0b3b4ab 2023-01-06 | [masic] 'show interfaces counters' reminds to use '-d all' option to check for internal links (sonic-net#2466) [wenyiz2021] * 5613277d 2023-01-27 | [show_bfd] add local discriminator in show bfd command (sonic-net#2625) [Baorong Liu] linkmgrd: * 8803690 2023-01-31 | [active-active] force switch when config == active && target state == active (sonic-net#164) (HEAD -> 202205) [Jing Zhang] sairedis: * ad3d4d6 2023-02-01 | [sai_failure_dump]Invoking dump during SAI failure (sonic-net#1198) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] platform-common: * 6fd8992 2023-01-30 | Add missing sys imports (sonic-net#343) (HEAD -> 202205) [spilkey-cisco] * 1fbc864 2023-01-25 | Change get_tx_bias return type to list (sonic-net#342) [mihirpat1] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…e submodule head (#13606) swss: * 79223f0 2023-01-25 | [bfdorch] add local discriminator to state DB (#2629) (HEAD -> 202205) [Baorong Liu] * 64940d4 2023-01-25 | Vxlan tunnel endpoint custom monitoring APPL DB table. (#2589) [siqbal1986] * 0930529 2023-02-02 | Merge pull request #2650 from devpatha/202205 (github/202205) [Kevin Wang] * 8f5884f 2023-02-01 | Remove counters for Mux ACL [Devesh P Pathak] utilities: * 557adfcc 2023-02-01 | show logging CLI support for logs stored in tmpfs (#2641) (HEAD -> 202205) [mihirpat1] * 28d7bb26 2023-01-31 | Making 'show feature autorestart' more resilient to missing auto_restart config in CONFIG_DB (#2592) [kartik-arista] * e0b3b4ab 2023-01-06 | [masic] 'show interfaces counters' reminds to use '-d all' option to check for internal links (#2466) [wenyiz2021] * 5613277d 2023-01-27 | [show_bfd] add local discriminator in show bfd command (#2625) [Baorong Liu] linkmgrd: * 8803690 2023-01-31 | [active-active] force switch when config == active && target state == active (#164) (HEAD -> 202205) [Jing Zhang] sairedis: * ad3d4d6 2023-02-01 | [sai_failure_dump]Invoking dump during SAI failure (#1198) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] platform-common: * 6fd8992 2023-01-30 | Add missing sys imports (#343) (HEAD -> 202205) [spilkey-cisco] * 1fbc864 2023-01-25 | Change get_tx_bias return type to list (#342) [mihirpat1] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* added support for monitoring, primary and adv_prefix. changed filter_mac to overlay_dmac * Data Structures and code to write APP_DB VNET_MONITOR table entries for custom monitoring of Vxlan tunnel endpoints.
- What I did
This change is added to address the supervisord issue with clock setting back.
- How to verify it
Set a dut with some clock difference with NTP and sync to CMOS. Then boot up an image with the fix. Confirming that the initial jump didn't happen when ntpd starts with a few reboots and ntpd restarts. And leave the system up and watch the clock slowly drift back towards the correct NTP time (ntpstats).