[NTP] Add NTP extended configuration #15058
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
fastiuk
force-pushed
the
dev-ntp-configuration
branch
3 times, most recently
from
ac7c66f
to
235778b
Compare
|
/azpw run Azure.sonic-buildimage |
|
/AzurePipelines run Azure.sonic-buildimage |
|
Pull request contains merge conflicts. |
fastiuk
force-pushed
the
dev-ntp-configuration
branch
from
235778b
to
f06adf4
Compare
|
The test failed because the code sonic-net/sonic-host-services#60 should be merged. |
saiarcot895
reviewed
Jul 3, 2023
saiarcot895
reviewed
Jul 3, 2023
saiarcot895
reviewed
Jul 3, 2023
saiarcot895
reviewed
Jul 3, 2023
saiarcot895
reviewed
Jul 3, 2023
| @@ -27,21 +28,29 @@ fi | |||
|
|
|||
| ( | |||
| flock -w 180 9 | |||
| ntpEnabled=$(/usr/local/bin/sonic-cfggen -d -v 'NTP["global"]["admin_state"]' 2> /dev/null) | |||
| if [ "$ntpEnabled" = "disabled" ] | |||
There was a problem hiding this comment.
Can ExecCondition= in the systemd service file be used to check this condition instead? That way the service status will accurately reflect that a condition check failed.
There also shoudn't be another ntp daemon running at this point of time, so there shouldn't be anything that needs to be stopped.
There was a problem hiding this comment.
hmm. nice idea, I guess it will work. I will try it and let you know the result here
There was a problem hiding this comment.
Any update here on whether this worked?
There was a problem hiding this comment.
Hey. I tried it with another daemon and it actually works fine. I tried to rework it here, but it won't work here in a couple of reasons:
- It is not a one-line solution and will basically make this implementation more complex.
- We are using lock here, which will be much harder to use in the service file.
- We need to use
ExecStopPostcondition to stop the daemon.
Other reasons I don't like this option:
- We need to modify ntp service file which is controlled by open source community and not modified by us.
- That
ntp-systemd-wrapperscript was created exactly to customize the control of ntp daemon.
So I would like to avoid of such changes
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
…access for other. Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
fastiuk
force-pushed
the
dev-ntp-configuration
branch
from
f06adf4
to
2cbcae9
Compare
|
+@ganglyu to review SONiC Yang model |
ganglyu
reviewed
Dec 2, 2023
| @@ -68,6 +105,9 @@ module sonic-ntp { | |||
| type leafref { | |||
| path /mprt:sonic-mgmt_port/mprt:MGMT_PORT/mprt:MGMT_PORT_LIST/mprt:name; | |||
| } | |||
| type string { | |||
| pattern 'eth0'; | |||
| } | |||
There was a problem hiding this comment.
why do you need this type?
I think eth0 is the management port
There was a problem hiding this comment.
Exactly, eth0 will be covered by MGMT_PORT, but if it is undefined in MGMT_PORT (which is possible, at first boot, for example) it will fail during build, because it checks for init_cfg conforms YANG model. So my logic here: src_intf is either port from MGMT_PORT, or eth0, or port from other leafref.
|
would you please update src/sonic-yang-models/tests/files/sample_config_db.json? |
Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
updated |
ganglyu
approved these changes
Dec 2, 2023
|
@qiluo-msft all comments resolved. Can we proceed with that? |
qiluo-msft
approved these changes
Dec 11, 2023
saiarcot895
added a commit
to saiarcot895/sonic-buildimage
that referenced
this pull request
Jun 28, 2024
In sonic-net#15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. To restore the old behavior, when loading from minigraph, add `"iburst": "true"` for each NTP server loaded from minigraph. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This was referenced Jun 28, 2024
yxieca
pushed a commit
that referenced
this pull request
Jul 11, 2024
Why I did it In #15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes #19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
arun1355492
pushed a commit
to arun1355492/sonic-buildimage
that referenced
this pull request
Jul 26, 2024
…#19424) Why I did it In sonic-net#15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes sonic-net#19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This was referenced Jul 30, 2024
Merged
saiarcot895
added a commit
to saiarcot895/sonic-buildimage
that referenced
this pull request
Jul 31, 2024
…#19424) Why I did it In sonic-net#15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes sonic-net#19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
11 tasks
yxieca
pushed a commit
that referenced
this pull request
Jul 31, 2024
…19741) Why I did it In #15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes #19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Jul 31, 2024
…#19424) Why I did it In sonic-net#15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes sonic-net#19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld
pushed a commit
that referenced
this pull request
Jul 31, 2024
Why I did it In #15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes #19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa
pushed a commit
to liushilongbuaa/sonic-buildimage
that referenced
this pull request
Aug 1, 2024
…#19424) Why I did it In sonic-net#15058, the NTP server configuration was modified to add additional options, such as conditionally enabling iburst, specifying the association type, and specifying the NTP version. One side effect of this was that the iburst option which was previously always enabled now requires it to be explicitly enabled in the config_db. Fixes sonic-net#19425. How I did it To restore the old behavior, when loading from minigraph, add "iburst": "true" for each NTP server loaded from minigraph. How to verify it Tested on a KVM setup, verified that the generated ntp.conf file had the iburst option. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
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.
hld #1296
closes #1254
depends-on #60, #781, #2835, #10749
Why I did it
To cover the next AIs:
Work item tracking
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
NTP configuration
A picture of a cute animal (it is my cat Finn)