MSVSphere Packaging Team
parent
d27e8bd6bf
commit
b509250997
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,345 @@
|
|||||||
|
From fe74e4d7dec4ba1f8ffb5b0c2713e36a1ffb1a1c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
||||||
|
Date: Mon, 10 Jun 2024 12:03:59 +0300
|
||||||
|
Subject: [PATCH] Synchronize time via Russian NTP servers
|
||||||
|
|
||||||
|
---
|
||||||
|
FAQ | 12 ++++++------
|
||||||
|
INSTALL | 4 ++--
|
||||||
|
doc/chrony.conf.adoc | 8 ++++----
|
||||||
|
doc/chrony.conf.man.in | 12 ++++++------
|
||||||
|
doc/chronyc.adoc | 2 +-
|
||||||
|
doc/chronyc.man.in | 4 ++--
|
||||||
|
doc/faq.adoc | 12 ++++++------
|
||||||
|
doc/installation.adoc | 4 ++--
|
||||||
|
examples/chrony.conf.example1 | 11 +++++++++--
|
||||||
|
examples/chrony.conf.example2 | 12 +++++++++---
|
||||||
|
examples/chrony.conf.example3 | 4 ++--
|
||||||
|
11 files changed, 49 insertions(+), 36 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/FAQ b/FAQ
|
||||||
|
index c96acfa..18687b7 100644
|
||||||
|
--- a/FAQ
|
||||||
|
+++ b/FAQ
|
||||||
|
@@ -101,7 +101,7 @@ poll multiple servers at the same time and detect servers having incorrect time
|
||||||
|
(falsetickers in the NTP terminology). It should be used only with trusted
|
||||||
|
reliable servers, ideally in local network.
|
||||||
|
|
||||||
|
-Using timesyncd with pool.ntp.org is problematic. The pool is very robust as a
|
||||||
|
+Using timesyncd with https://www.vniiftri.ru/ is problematic. The pool is very robust as a
|
||||||
|
whole, but the individual servers run by volunteers cannot be relied on.
|
||||||
|
Occasionally, servers drift away or make a step to distant past or future due
|
||||||
|
to misconfiguration, problematic implementation, and other bugs (e.g. in
|
||||||
|
@@ -141,10 +141,10 @@ next boot from the RTC, the rtcsync directive enables a mode in which the
|
||||||
|
system time is periodically copied to the RTC. It is supported on Linux and
|
||||||
|
macOS.
|
||||||
|
|
||||||
|
-If you wanted to use public NTP servers from the pool.ntp.org project, the
|
||||||
|
+If you wanted to use public NTP servers from the https://www.vniiftri.ru/ project, the
|
||||||
|
minimal chrony.conf file could be:
|
||||||
|
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool https://www.vniiftri.ru/ iburst
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
makestep 1 3
|
||||||
|
rtcsync
|
||||||
|
@@ -433,7 +433,7 @@ the -Q option it will print the measured offset without setting the clock. If
|
||||||
|
you do not want to use a configuration file, NTP servers can be specified on
|
||||||
|
the command line. For example:
|
||||||
|
|
||||||
|
-# chronyd -q 'pool pool.ntp.org iburst'
|
||||||
|
+# chronyd -q 'pool https://www.vniiftri.ru/ iburst'
|
||||||
|
|
||||||
|
The command above would normally take about 5 seconds if the servers were well
|
||||||
|
synchronised and responding to all requests. If not synchronised or responding,
|
||||||
|
@@ -444,7 +444,7 @@ option to one (supported since chrony version 4.0), and a timeout can be
|
||||||
|
specified with the -t option. The following command would take only up to about
|
||||||
|
one second.
|
||||||
|
|
||||||
|
-# chronyd -q -t 1 'server pool.ntp.org iburst maxsamples 1'
|
||||||
|
+# chronyd -q -t 1 'server https://www.vniiftri.ru/ iburst maxsamples 1'
|
||||||
|
|
||||||
|
It is not recommended to run chronyd with the -q option periodically (e.g. from
|
||||||
|
a cron job) as a replacement for the daemon mode, because it performs
|
||||||
|
@@ -507,7 +507,7 @@ same server instance.
|
||||||
|
|
||||||
|
An example configuration of the client instance could be
|
||||||
|
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool https://www.vniiftri.ru/ iburst
|
||||||
|
allow 127.0.0.1
|
||||||
|
port 11123
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
diff --git a/INSTALL b/INSTALL
|
||||||
|
index 9ca6e22..6f48020 100644
|
||||||
|
--- a/INSTALL
|
||||||
|
+++ b/INSTALL
|
||||||
|
@@ -116,10 +116,10 @@ make install-docs
|
||||||
|
Now that the software is successfully installed, the next step is to set up a
|
||||||
|
configuration file. The default location of the file is /etc/chrony.conf.
|
||||||
|
Several examples of configuration with comments are included in the examples
|
||||||
|
-directory. Suppose you want to use public NTP servers from the pool.ntp.org
|
||||||
|
+directory. Suppose you want to use public NTP servers from the https://www.vniiftri.ru/
|
||||||
|
project as your time reference. A minimal useful configuration file could be
|
||||||
|
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool https://www.vniiftri.ru/ iburst
|
||||||
|
makestep 1.0 3
|
||||||
|
rtcsync
|
||||||
|
|
||||||
|
diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc
|
||||||
|
index cb3f95c..832a97f 100644
|
||||||
|
--- a/doc/chrony.conf.adoc
|
||||||
|
+++ b/doc/chrony.conf.adoc
|
||||||
|
@@ -365,7 +365,7 @@ sources responding to requests. The default value is 4 and the maximum value is
|
||||||
|
An example of the *pool* directive is
|
||||||
|
+
|
||||||
|
----
|
||||||
|
-pool pool.ntp.org iburst maxsources 3
|
||||||
|
+pool ntp1.vniiftri.ru iburst maxsources 3
|
||||||
|
----
|
||||||
|
|
||||||
|
[[peer]]*peer* _hostname_ [_option_]...::
|
||||||
|
@@ -2820,7 +2820,7 @@ the following methods:
|
||||||
|
stratum 1 and stratum 2 servers. You should find one or more servers that are
|
||||||
|
near to you. Check that their access policy allows you to use their
|
||||||
|
facilities.
|
||||||
|
-* Use public servers from the https://www.pool.ntp.org/[pool.ntp.org] project.
|
||||||
|
+* Use public servers from the https://www.vniiftri.ru/[ntp1.vniiftri.ru] project.
|
||||||
|
|
||||||
|
Assuming that your NTP servers are called _ntp1.example.net_, _ntp2.example.net_
|
||||||
|
and _ntp3.example.net_, your _chrony.conf_ file could contain as a minimum:
|
||||||
|
@@ -2853,7 +2853,7 @@ directive instead of multiple *server* directives. The configuration file could
|
||||||
|
in this case look like:
|
||||||
|
|
||||||
|
----
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool ntp1.vniiftri.ru iburst
|
||||||
|
driftfile @CHRONYVARDIR@/drift
|
||||||
|
makestep 1.0 3
|
||||||
|
rtcsync
|
||||||
|
@@ -3112,7 +3112,7 @@ information to be saved.
|
||||||
|
=== Public NTP server
|
||||||
|
|
||||||
|
*chronyd* can be configured to operate as a public NTP server, e.g. to join the
|
||||||
|
-https://www.pool.ntp.org/en/join.html[pool.ntp.org] project. The configuration
|
||||||
|
+https://www.vniiftri.ru/[ntp1.vniiftri.ru] project. The configuration
|
||||||
|
is similar to the NTP client with permanent connection, except it needs to
|
||||||
|
allow client access from all addresses. It is recommended to find at least four
|
||||||
|
good servers (e.g. from the pool, or on the NTP homepage). If the server has a
|
||||||
|
diff --git a/doc/chrony.conf.man.in b/doc/chrony.conf.man.in
|
||||||
|
index 66d2358..8b88b70 100644
|
||||||
|
--- a/doc/chrony.conf.man.in
|
||||||
|
+++ b/doc/chrony.conf.man.in
|
||||||
|
@@ -479,7 +479,7 @@ An example of the \fBpool\fP directive is
|
||||||
|
.if n .RS 4
|
||||||
|
.nf
|
||||||
|
.fam C
|
||||||
|
-pool pool.ntp.org iburst maxsources 3
|
||||||
|
+pool ntp1.vniiftri].ru iburst maxsources 3
|
||||||
|
.fam
|
||||||
|
.fi
|
||||||
|
.if n .RE
|
||||||
|
@@ -4651,7 +4651,7 @@ facilities.
|
||||||
|
. IP \(bu 2.3
|
||||||
|
.\}
|
||||||
|
Use public servers from the \c
|
||||||
|
-.URL "https://www.pool.ntp.org/" "pool.ntp.org" ""
|
||||||
|
+.URL "https://www.ntp1.vniiftri].ru/" "ntp1.vniiftri].ru" ""
|
||||||
|
project.
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
@@ -4696,7 +4696,7 @@ in this case look like:
|
||||||
|
.if n .RS 4
|
||||||
|
.nf
|
||||||
|
.fam C
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool ntp1.vniiftri].ru iburst
|
||||||
|
driftfile @CHRONYVARDIR@/drift
|
||||||
|
makestep 1.0 3
|
||||||
|
rtcsync
|
||||||
|
@@ -4993,8 +4993,8 @@ information to be saved.
|
||||||
|
.SS "Public NTP server"
|
||||||
|
.sp
|
||||||
|
\fBchronyd\fP can be configured to operate as a public NTP server, e.g. to join the
|
||||||
|
-.URL "https://www.pool.ntp.org/en/join.html" "pool.ntp.org" ""
|
||||||
|
-project. The configuration
|
||||||
|
+.URL "https://www.ntp.vniiftri].ru/en/join.html" "ntp1.vniiftri].ru" ""
|
||||||
|
+\fBchronyd\fP can be configured to operate as a public NTP server. The configuration
|
||||||
|
is similar to the NTP client with permanent connection, except it needs to
|
||||||
|
allow client access from all addresses. It is recommended to find at least four
|
||||||
|
good servers (e.g. from the pool, or on the NTP homepage). If the server has a
|
||||||
|
@@ -5040,4 +5040,4 @@ For instructions on how to report bugs, please visit
|
||||||
|
.URL "https://chrony\-project.org/" "" "."
|
||||||
|
.SH "AUTHORS"
|
||||||
|
.sp
|
||||||
|
-chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
||||||
|
\ No newline at end of file
|
||||||
|
+chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
||||||
|
diff --git a/doc/chronyc.adoc b/doc/chronyc.adoc
|
||||||
|
index 96a0551..d88c7dc 100644
|
||||||
|
--- a/doc/chronyc.adoc
|
||||||
|
+++ b/doc/chronyc.adoc
|
||||||
|
@@ -979,7 +979,7 @@ them immediately, e.g. after suspending and resuming the machine in a different
|
||||||
|
network.
|
||||||
|
+
|
||||||
|
Note that with pools which have more than 16 addresses, or not all IPv4 or IPv6
|
||||||
|
-addresses are included in a single DNS response (e.g. pool.ntp.org), this
|
||||||
|
+addresses are included in a single DNS response (e.g. https://www.vniiftri.ru/), this
|
||||||
|
command might replace the addresses even if they are still in the pool.
|
||||||
|
|
||||||
|
[[reload]]*reload* *sources*::
|
||||||
|
diff --git a/doc/chronyc.man.in b/doc/chronyc.man.in
|
||||||
|
index 4541fc6..7888eff 100644
|
||||||
|
--- a/doc/chronyc.man.in
|
||||||
|
+++ b/doc/chronyc.man.in
|
||||||
|
@@ -1793,7 +1793,7 @@ them immediately, e.g. after suspending and resuming the machine in a different
|
||||||
|
network.
|
||||||
|
.sp
|
||||||
|
Note that with pools which have more than 16 addresses, or not all IPv4 or IPv6
|
||||||
|
-addresses are included in a single DNS response (e.g. pool.ntp.org), this
|
||||||
|
+addresses are included in a single DNS response (e.g. ntp1.vniiftri.ru), this
|
||||||
|
command might replace the addresses even if they are still in the pool.
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
@@ -2753,4 +2753,4 @@ For instructions on how to report bugs, please visit
|
||||||
|
.URL "https://chrony\-project.org/" "" "."
|
||||||
|
.SH "AUTHORS"
|
||||||
|
.sp
|
||||||
|
-chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
||||||
|
\ No newline at end of file
|
||||||
|
+chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
||||||
|
diff --git a/doc/faq.adoc b/doc/faq.adoc
|
||||||
|
index 8fd350f..69b8b3e 100644
|
||||||
|
--- a/doc/faq.adoc
|
||||||
|
+++ b/doc/faq.adoc
|
||||||
|
@@ -56,7 +56,7 @@ limitations is that it cannot poll multiple servers at the same time and detect
|
||||||
|
servers having incorrect time (falsetickers in the NTP terminology). It should
|
||||||
|
be used only with trusted reliable servers, ideally in local network.
|
||||||
|
|
||||||
|
-Using `timesyncd` with `pool.ntp.org` is problematic. The pool is very
|
||||||
|
+Using `timesyncd` with `ntp.vniiftri.ru` is problematic. The pool is very
|
||||||
|
robust as a whole, but the individual servers run by volunteers cannot be
|
||||||
|
relied on. Occasionally, servers drift away or make a step to distant past or
|
||||||
|
future due to misconfiguration, problematic implementation, and other bugs
|
||||||
|
@@ -98,11 +98,11 @@ system time is periodically copied to the RTC. It is supported on Linux and
|
||||||
|
macOS.
|
||||||
|
|
||||||
|
If you wanted to use public NTP servers from the
|
||||||
|
-https://www.pool.ntp.org/[pool.ntp.org] project, the minimal _chrony.conf_ file
|
||||||
|
+https://www.vniiftri.ru/[ntp1.vniiftri.ru] project, the minimal _chrony.conf_ file
|
||||||
|
could be:
|
||||||
|
|
||||||
|
----
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool ntp1.vniiftri.ru iburst
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
makestep 1 3
|
||||||
|
rtcsync
|
||||||
|
@@ -411,7 +411,7 @@ clock. If you do not want to use a configuration file, NTP servers can be
|
||||||
|
specified on the command line. For example:
|
||||||
|
|
||||||
|
----
|
||||||
|
-# chronyd -q 'pool pool.ntp.org iburst'
|
||||||
|
+# chronyd -q 'pool ntp1.vniiftri.ru iburst'
|
||||||
|
----
|
||||||
|
|
||||||
|
The command above would normally take about 5 seconds if the servers were
|
||||||
|
@@ -424,7 +424,7 @@ timeout can be specified with the `-t` option. The following command would take
|
||||||
|
only up to about one second.
|
||||||
|
|
||||||
|
----
|
||||||
|
-# chronyd -q -t 1 'server pool.ntp.org iburst maxsamples 1'
|
||||||
|
+# chronyd -q -t 1 'server ntp1.vniiftri.ru iburst maxsamples 1'
|
||||||
|
----
|
||||||
|
|
||||||
|
It is not recommended to run `chronyd` with the `-q` option periodically (e.g.
|
||||||
|
@@ -491,7 +491,7 @@ the same server instance.
|
||||||
|
An example configuration of the client instance could be
|
||||||
|
|
||||||
|
----
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool ntp1.vniiftri.ru iburst
|
||||||
|
allow 127.0.0.1
|
||||||
|
port 11123
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
diff --git a/doc/installation.adoc b/doc/installation.adoc
|
||||||
|
index b683911..0fa1eca 100644
|
||||||
|
--- a/doc/installation.adoc
|
||||||
|
+++ b/doc/installation.adoc
|
||||||
|
@@ -146,11 +146,11 @@ make install-docs
|
||||||
|
Now that the software is successfully installed, the next step is to set up a
|
||||||
|
configuration file. The default location of the file is _/etc/chrony.conf_.
|
||||||
|
Several examples of configuration with comments are included in the examples
|
||||||
|
-directory. Suppose you want to use public NTP servers from the pool.ntp.org
|
||||||
|
+directory. Suppose you want to use public NTP servers from the ntp1.vniiftri.ru
|
||||||
|
project as your time reference. A minimal useful configuration file could be
|
||||||
|
|
||||||
|
----
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+pool ntp1.vniiftri.ru iburst
|
||||||
|
makestep 1.0 3
|
||||||
|
rtcsync
|
||||||
|
----
|
||||||
|
diff --git a/examples/chrony.conf.example1 b/examples/chrony.conf.example1
|
||||||
|
index 5e93ea7..dd960ad 100644
|
||||||
|
--- a/examples/chrony.conf.example1
|
||||||
|
+++ b/examples/chrony.conf.example1
|
||||||
|
@@ -1,5 +1,12 @@
|
||||||
|
-# Use public NTP servers from the pool.ntp.org project.
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+# Use Russian public NTP servers (vniiftri and msk-ix)
|
||||||
|
+server ntp.msk-ix.ru iburst
|
||||||
|
+server ntp1.vniiftri.ru iburst
|
||||||
|
+server vniiftri2.khv.ru iburst
|
||||||
|
+server ntp1.niiftri.irkutsk.ru iburst
|
||||||
|
+server ntp.sstf.nsk.ru iburst
|
||||||
|
+server ntp2.vniiftri.ru iburst
|
||||||
|
+server ntp3.vniiftri.ru iburst
|
||||||
|
+server ntp4.vniiftri.ru iburst
|
||||||
|
|
||||||
|
# Record the rate at which the system clock gains/losses time.
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
diff --git a/examples/chrony.conf.example2 b/examples/chrony.conf.example2
|
||||||
|
index bf2bbdd..61b4576 100644
|
||||||
|
--- a/examples/chrony.conf.example2
|
||||||
|
+++ b/examples/chrony.conf.example2
|
||||||
|
@@ -1,6 +1,12 @@
|
||||||
|
-# Use public servers from the pool.ntp.org project.
|
||||||
|
-# Please consider joining the pool (https://www.pool.ntp.org/join.html).
|
||||||
|
-pool pool.ntp.org iburst
|
||||||
|
+# Use Russian public NTP servers (vniiftri and msk-ix)
|
||||||
|
+server ntp.msk-ix.ru iburst
|
||||||
|
+server ntp1.vniiftri.ru iburst
|
||||||
|
+server vniiftri2.khv.ru iburst
|
||||||
|
+server ntp1.niiftri.irkutsk.ru iburst
|
||||||
|
+server ntp.sstf.nsk.ru iburst
|
||||||
|
+server ntp2.vniiftri.ru iburst
|
||||||
|
+server ntp3.vniiftri.ru iburst
|
||||||
|
+server ntp4.vniiftri.ru iburst
|
||||||
|
|
||||||
|
# Record the rate at which the system clock gains/losses time.
|
||||||
|
driftfile /var/lib/chrony/drift
|
||||||
|
diff --git a/examples/chrony.conf.example3 b/examples/chrony.conf.example3
|
||||||
|
index 6d84c01..e893292 100644
|
||||||
|
--- a/examples/chrony.conf.example3
|
||||||
|
+++ b/examples/chrony.conf.example3
|
||||||
|
@@ -25,13 +25,13 @@
|
||||||
|
# Provider or company have one or more NTP servers that you can specify.
|
||||||
|
# Failing that, there are a lot of public NTP servers. There is a list
|
||||||
|
# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
|
||||||
|
-# you can use servers from the pool.ntp.org project.
|
||||||
|
+# you can use servers from the https://www.vniiftri.ru/ project.
|
||||||
|
|
||||||
|
! server ntp1.example.net iburst
|
||||||
|
! server ntp2.example.net iburst
|
||||||
|
! server ntp3.example.net iburst
|
||||||
|
|
||||||
|
-! pool pool.ntp.org iburst
|
||||||
|
+! pool ntp1.vniiftri.ru iburst
|
||||||
|
|
||||||
|
#######################################################################
|
||||||
|
### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
|
||||||
|
--
|
||||||
|
2.39.3
|
||||||
|
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
--- chrony-4.5/doc/chrony.conf.man.in 2023-12-05 14:26:13.000000000 +0100
|
||||||
|
+++ chrony.conf.man.in 2024-07-30 14:17:30.000000000 +0200
|
||||||
|
@@ -908,9 +915,10 @@
|
||||||
|
.RS 4
|
||||||
|
This option indicates that the reference clock keeps time in TAI instead of UTC
|
||||||
|
and that \fBchronyd\fP should correct its offset by the current TAI\-UTC offset. The
|
||||||
|
-\fBleapsectz\fP directive must be used with this option and the
|
||||||
|
-database must be kept up to date in order for this correction to work as
|
||||||
|
-expected. This option does not make sense with PPS refclocks.
|
||||||
|
+\fBleapsectz\fP or \fBleapseclist\fP directive must be
|
||||||
|
+used with this option and the database must be kept up to date in order for
|
||||||
|
+this correction to work as expected. This option does not make sense with PPS
|
||||||
|
+refclocks.
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fBlocal\fP
|
||||||
|
@@ -1652,6 +1660,25 @@
|
||||||
|
.if n .RE
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
+\fBleapseclist\fP \fIfile\fP
|
||||||
|
+.RS 4
|
||||||
|
+This directive specifies the path to a file containing a list of leap seconds
|
||||||
|
+and TAI\-UTC offsets in NIST/IERS format. It is recommended to use
|
||||||
|
+the file \fIleap\-seconds.list\fP usually included with the system timezone
|
||||||
|
+database. The behaviour of this directive is otherwise equivalent to
|
||||||
|
+\fBleapsectz\fP.
|
||||||
|
+.sp
|
||||||
|
+An example of this directive is:
|
||||||
|
+.sp
|
||||||
|
+.if n .RS 4
|
||||||
|
+.nf
|
||||||
|
+.fam C
|
||||||
|
+leapseclist /usr/share/zoneinfo/leap\-seconds.list
|
||||||
|
+.fam
|
||||||
|
+.fi
|
||||||
|
+.if n .RE
|
||||||
|
+.RE
|
||||||
|
+.sp
|
||||||
|
\fBmakestep\fP \fIthreshold\fP \fIlimit\fP
|
||||||
|
.RS 4
|
||||||
|
Normally \fBchronyd\fP will cause the system to gradually correct any time offset,
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,291 @@
|
|||||||
|
commit 78707d0717db7f410b3b1e1d4ae13d5cbf863a5e
|
||||||
|
Author: Miroslav Lichvar <mlichvar@redhat.com>
|
||||||
|
Date: Tue Aug 6 10:45:55 2024 +0200
|
||||||
|
|
||||||
|
test: extend 008-confload test
|
||||||
|
|
||||||
|
diff --git a/test/system/008-confload b/test/system/008-confload
|
||||||
|
index 7e806988..b978c190 100755
|
||||||
|
--- a/test/system/008-confload
|
||||||
|
+++ b/test/system/008-confload
|
||||||
|
@@ -77,7 +77,32 @@ check_chronyc_output "^[^=]*
|
||||||
|
.. 127\.123\.5\.3 *[05] 7 [^^]*
|
||||||
|
.. 127\.123\.5\.6 [^^]*$" || test_fail
|
||||||
|
|
||||||
|
+run_chronyc "reload sources" || test_fail
|
||||||
|
+run_chronyc "reload sources" || test_fail
|
||||||
|
+
|
||||||
|
+rm $TEST_DIR/conf5.d/{3,5,6}.sources
|
||||||
|
+echo "server 127.123.5.7" > $TEST_DIR/conf5.d/7.sources
|
||||||
|
+
|
||||||
|
+run_chronyc "reload sources" || test_fail
|
||||||
|
+
|
||||||
|
+run_chronyc "sources" || test_fail
|
||||||
|
+check_chronyc_output "^[^=]*
|
||||||
|
+=*
|
||||||
|
+.. 127\.123\.1\.1 [^^]*
|
||||||
|
+.. 127\.123\.1\.3 [^^]*
|
||||||
|
+.. 127\.123\.1\.4 [^^]*
|
||||||
|
+.. 127\.123\.3\.1 [^^]*
|
||||||
|
+.. 127\.123\.2\.2 [^^]*
|
||||||
|
+.. 127\.123\.2\.3 [^^]*
|
||||||
|
+.. 127\.123\.4\.4 [^^]*
|
||||||
|
+.. 127\.123\.1\.2 *[05] 6 [^^]*
|
||||||
|
+.. 127\.123\.5\.2 *[05] 5 [^^]*
|
||||||
|
+.. 127\.123\.5\.7 [^^]*$" || test_fail
|
||||||
|
+
|
||||||
|
+run_chronyc "reload sources" || test_fail
|
||||||
|
+
|
||||||
|
stop_chronyd || test_fail
|
||||||
|
-check_chronyd_message_count "Could not add source" 1 1 || test_fail
|
||||||
|
+check_chronyd_message_count "Could not add source.*\.5\.5.*in use" 3 3 || test_fail
|
||||||
|
+check_chronyd_message_count "Could not add source" 3 3 || test_fail
|
||||||
|
|
||||||
|
test_pass
|
||||||
|
|
||||||
|
commit 3cac849bbfdc02625969cb721207d5436dc03ee4
|
||||||
|
Author: Miroslav Lichvar <mlichvar@redhat.com>
|
||||||
|
Date: Tue Aug 6 11:28:26 2024 +0200
|
||||||
|
|
||||||
|
conf: merge ntp_source_ids with ntp_sources
|
||||||
|
|
||||||
|
Keep the configuration IDs of sources loaded from sourcedir in the
|
||||||
|
NTP_Source structure itself to simplify the code.
|
||||||
|
|
||||||
|
(Rebased to 4.5)
|
||||||
|
|
||||||
|
diff --git a/conf.c b/conf.c
|
||||||
|
index 146389aa..dad874b0 100644
|
||||||
|
--- a/conf.c
|
||||||
|
+++ b/conf.c
|
||||||
|
@@ -287,15 +287,14 @@ typedef struct {
|
||||||
|
NTP_Source_Type type;
|
||||||
|
int pool;
|
||||||
|
CPS_NTP_Source params;
|
||||||
|
+ uint32_t conf_id;
|
||||||
|
} NTP_Source;
|
||||||
|
|
||||||
|
/* Array of NTP_Source */
|
||||||
|
static ARR_Instance ntp_sources;
|
||||||
|
/* Array of (char *) */
|
||||||
|
static ARR_Instance ntp_source_dirs;
|
||||||
|
-/* Array of uint32_t corresponding to ntp_sources (for sourcedirs reload) */
|
||||||
|
-static ARR_Instance ntp_source_ids;
|
||||||
|
-/* Flag indicating ntp_sources and ntp_source_ids are used for sourcedirs */
|
||||||
|
+/* Flag indicating ntp_sources is used for sourcedirs after config load */
|
||||||
|
static int conf_ntp_sources_added = 0;
|
||||||
|
|
||||||
|
/* Array of RefclockParameters */
|
||||||
|
@@ -396,7 +395,6 @@ CNF_Initialise(int r, int client_only)
|
||||||
|
init_sources = ARR_CreateInstance(sizeof (IPAddr));
|
||||||
|
ntp_sources = ARR_CreateInstance(sizeof (NTP_Source));
|
||||||
|
ntp_source_dirs = ARR_CreateInstance(sizeof (char *));
|
||||||
|
- ntp_source_ids = ARR_CreateInstance(sizeof (uint32_t));
|
||||||
|
refclock_sources = ARR_CreateInstance(sizeof (RefclockParameters));
|
||||||
|
broadcasts = ARR_CreateInstance(sizeof (NTP_Broadcast_Destination));
|
||||||
|
|
||||||
|
@@ -456,7 +454,6 @@ CNF_Finalise(void)
|
||||||
|
ARR_DestroyInstance(init_sources);
|
||||||
|
ARR_DestroyInstance(ntp_sources);
|
||||||
|
ARR_DestroyInstance(ntp_source_dirs);
|
||||||
|
- ARR_DestroyInstance(ntp_source_ids);
|
||||||
|
ARR_DestroyInstance(refclock_sources);
|
||||||
|
ARR_DestroyInstance(broadcasts);
|
||||||
|
|
||||||
|
@@ -825,6 +822,8 @@ parse_source(char *line, char *type, int fatal)
|
||||||
|
}
|
||||||
|
|
||||||
|
source.params.name = Strdup(source.params.name);
|
||||||
|
+ source.conf_id = 0;
|
||||||
|
+
|
||||||
|
ARR_AppendElement(ntp_sources, &source);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1678,7 +1677,6 @@ reload_source_dirs(void)
|
||||||
|
{
|
||||||
|
NTP_Source *prev_sources, *new_sources, *source;
|
||||||
|
unsigned int i, j, prev_size, new_size, unresolved;
|
||||||
|
- uint32_t *prev_ids, *new_ids;
|
||||||
|
char buf[MAX_LINE_LENGTH];
|
||||||
|
NSR_Status s;
|
||||||
|
int d, pass;
|
||||||
|
@@ -1687,13 +1685,9 @@ reload_source_dirs(void)
|
||||||
|
if (!conf_ntp_sources_added)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- prev_size = ARR_GetSize(ntp_source_ids);
|
||||||
|
- if (ARR_GetSize(ntp_sources) != prev_size)
|
||||||
|
- assert(0);
|
||||||
|
+ prev_size = ARR_GetSize(ntp_sources);
|
||||||
|
|
||||||
|
- /* Save the current sources and their configuration IDs */
|
||||||
|
- prev_ids = MallocArray(uint32_t, prev_size);
|
||||||
|
- memcpy(prev_ids, ARR_GetElements(ntp_source_ids), prev_size * sizeof (prev_ids[0]));
|
||||||
|
+ /* Save the current sources */
|
||||||
|
prev_sources = MallocArray(NTP_Source, prev_size);
|
||||||
|
memcpy(prev_sources, ARR_GetElements(ntp_sources), prev_size * sizeof (prev_sources[0]));
|
||||||
|
|
||||||
|
@@ -1711,8 +1705,6 @@ reload_source_dirs(void)
|
||||||
|
|
||||||
|
new_size = ARR_GetSize(ntp_sources);
|
||||||
|
new_sources = ARR_GetElements(ntp_sources);
|
||||||
|
- ARR_SetSize(ntp_source_ids, new_size);
|
||||||
|
- new_ids = ARR_GetElements(ntp_source_ids);
|
||||||
|
unresolved = 0;
|
||||||
|
|
||||||
|
LOG_SetContext(LOGC_SourceFile);
|
||||||
|
@@ -1728,14 +1720,14 @@ reload_source_dirs(void)
|
||||||
|
|
||||||
|
/* Remove missing sources before adding others to avoid conflicts */
|
||||||
|
if (pass == 0 && d < 0 && prev_sources[i].params.name[0] != '\0') {
|
||||||
|
- NSR_RemoveSourcesById(prev_ids[i]);
|
||||||
|
+ NSR_RemoveSourcesById(prev_sources[i].conf_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add new sources */
|
||||||
|
if (pass == 1 && d > 0) {
|
||||||
|
source = &new_sources[j];
|
||||||
|
s = NSR_AddSourceByName(source->params.name, source->params.port, source->pool,
|
||||||
|
- source->type, &source->params.params, &new_ids[j]);
|
||||||
|
+ source->type, &source->params.params, &source->conf_id);
|
||||||
|
|
||||||
|
if (s == NSR_UnresolvedName) {
|
||||||
|
unresolved++;
|
||||||
|
@@ -1750,7 +1742,7 @@ reload_source_dirs(void)
|
||||||
|
|
||||||
|
/* Keep unchanged sources */
|
||||||
|
if (pass == 1 && d == 0)
|
||||||
|
- new_ids[j] = prev_ids[i];
|
||||||
|
+ new_sources[j].conf_id = prev_sources[i].conf_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1759,7 +1751,6 @@ reload_source_dirs(void)
|
||||||
|
for (i = 0; i < prev_size; i++)
|
||||||
|
Free(prev_sources[i].params.name);
|
||||||
|
Free(prev_sources);
|
||||||
|
- Free(prev_ids);
|
||||||
|
|
||||||
|
if (unresolved > 0)
|
||||||
|
NSR_ResolveSources();
|
||||||
|
@@ -1858,7 +1849,6 @@ CNF_AddSources(void)
|
||||||
|
|
||||||
|
/* The arrays will be used for sourcedir (re)loading */
|
||||||
|
ARR_SetSize(ntp_sources, 0);
|
||||||
|
- ARR_SetSize(ntp_source_ids, 0);
|
||||||
|
conf_ntp_sources_added = 1;
|
||||||
|
|
||||||
|
reload_source_dirs();
|
||||||
|
|
||||||
|
commit 8126dbd2de30957de32ce3e55ce367b7145a4c33
|
||||||
|
Author: Miroslav Lichvar <mlichvar@redhat.com>
|
||||||
|
Date: Tue Aug 6 12:56:39 2024 +0200
|
||||||
|
|
||||||
|
conf: save source status in sourcedir reload
|
||||||
|
|
||||||
|
Save the NSR status when adding a source from a sourcedir and don't
|
||||||
|
hide sources that failed the addition by clearing their name.
|
||||||
|
|
||||||
|
(Rebased to 4.5)
|
||||||
|
|
||||||
|
diff --git a/conf.c b/conf.c
|
||||||
|
index dad874b0..6020e880 100644
|
||||||
|
--- a/conf.c
|
||||||
|
+++ b/conf.c
|
||||||
|
@@ -287,6 +287,7 @@ typedef struct {
|
||||||
|
NTP_Source_Type type;
|
||||||
|
int pool;
|
||||||
|
CPS_NTP_Source params;
|
||||||
|
+ NSR_Status status;
|
||||||
|
uint32_t conf_id;
|
||||||
|
} NTP_Source;
|
||||||
|
|
||||||
|
@@ -822,6 +823,7 @@ parse_source(char *line, char *type, int fatal)
|
||||||
|
}
|
||||||
|
|
||||||
|
source.params.name = Strdup(source.params.name);
|
||||||
|
+ source.status = NSR_NoSuchSource;
|
||||||
|
source.conf_id = 0;
|
||||||
|
|
||||||
|
ARR_AppendElement(ntp_sources, &source);
|
||||||
|
@@ -1719,30 +1721,30 @@ reload_source_dirs(void)
|
||||||
|
d = i < prev_size ? -1 : 1;
|
||||||
|
|
||||||
|
/* Remove missing sources before adding others to avoid conflicts */
|
||||||
|
- if (pass == 0 && d < 0 && prev_sources[i].params.name[0] != '\0') {
|
||||||
|
+ if (pass == 0 && d < 0 && prev_sources[i].status == NSR_Success) {
|
||||||
|
NSR_RemoveSourcesById(prev_sources[i].conf_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* Add new sources */
|
||||||
|
- if (pass == 1 && d > 0) {
|
||||||
|
+ /* Add new sources and sources that could not be added before */
|
||||||
|
+ if (pass == 1 && (d > 0 || (d == 0 && prev_sources[i].status != NSR_Success))) {
|
||||||
|
source = &new_sources[j];
|
||||||
|
s = NSR_AddSourceByName(source->params.name, source->params.port, source->pool,
|
||||||
|
source->type, &source->params.params, &source->conf_id);
|
||||||
|
+ source->status = s;
|
||||||
|
|
||||||
|
if (s == NSR_UnresolvedName) {
|
||||||
|
unresolved++;
|
||||||
|
} else if (s != NSR_Success) {
|
||||||
|
LOG(LOGS_ERR, "Could not add source %s : %s",
|
||||||
|
source->params.name, NSR_StatusToString(s));
|
||||||
|
-
|
||||||
|
- /* Mark the source as not present */
|
||||||
|
- source->params.name[0] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Keep unchanged sources */
|
||||||
|
- if (pass == 1 && d == 0)
|
||||||
|
+ if (pass == 1 && d == 0) {
|
||||||
|
+ new_sources[j].status = prev_sources[i].status;
|
||||||
|
new_sources[j].conf_id = prev_sources[i].conf_id;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
commit 7cd5d065fc17a0ec871df2ffdc74caf6d16d9f6a
|
||||||
|
Author: Miroslav Lichvar <mlichvar@redhat.com>
|
||||||
|
Date: Tue Aug 6 13:05:26 2024 +0200
|
||||||
|
|
||||||
|
conf: don't repeat error message when adding sourcedir source
|
||||||
|
|
||||||
|
When a source from a configured sourcedir cannot be added (e.g. it is a
|
||||||
|
duplicate of another source), log the error message only on the first
|
||||||
|
attempt adding the source, until the source is removed and added to a
|
||||||
|
sourcedir again.
|
||||||
|
|
||||||
|
This avoids spamming of the system log with error messages if the
|
||||||
|
reload sources command is called frequently (e.g. from a DHCP renewal
|
||||||
|
networking script).
|
||||||
|
|
||||||
|
diff --git a/conf.c b/conf.c
|
||||||
|
index 6020e880..522e235a 100644
|
||||||
|
--- a/conf.c
|
||||||
|
+++ b/conf.c
|
||||||
|
@@ -1734,7 +1734,7 @@ reload_source_dirs(void)
|
||||||
|
|
||||||
|
if (s == NSR_UnresolvedName) {
|
||||||
|
unresolved++;
|
||||||
|
- } else if (s != NSR_Success) {
|
||||||
|
+ } else if (s != NSR_Success && (d > 0 || s != prev_sources[i].status)) {
|
||||||
|
LOG(LOGS_ERR, "Could not add source %s : %s",
|
||||||
|
source->params.name, NSR_StatusToString(s));
|
||||||
|
}
|
||||||
|
diff --git a/test/system/008-confload b/test/system/008-confload
|
||||||
|
index b978c190..b107d709 100755
|
||||||
|
--- a/test/system/008-confload
|
||||||
|
+++ b/test/system/008-confload
|
||||||
|
@@ -102,7 +102,7 @@ check_chronyc_output "^[^=]*
|
||||||
|
run_chronyc "reload sources" || test_fail
|
||||||
|
|
||||||
|
stop_chronyd || test_fail
|
||||||
|
-check_chronyd_message_count "Could not add source.*\.5\.5.*in use" 3 3 || test_fail
|
||||||
|
-check_chronyd_message_count "Could not add source" 3 3 || test_fail
|
||||||
|
+check_chronyd_message_count "Could not add source.*\.5\.5.*in use" 1 1 || test_fail
|
||||||
|
+check_chronyd_message_count "Could not add source" 1 1 || test_fail
|
||||||
|
|
||||||
|
test_pass
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
commit f49be7f06343ee27fff2950937d7f6742f53976f
|
||||||
|
Author: Miroslav Lichvar <mlichvar@redhat.com>
|
||||||
|
Date: Tue Mar 12 14:30:27 2024 +0100
|
||||||
|
|
||||||
|
conf: don't load sourcedir during initstepslew and RTC init
|
||||||
|
|
||||||
|
If the reload sources command was received in the chronyd start-up
|
||||||
|
sequence with initstepslew and/or RTC init (-s option), the sources
|
||||||
|
loaded from sourcedirs caused a crash due to failed assertion after
|
||||||
|
adding sources specified in the config.
|
||||||
|
|
||||||
|
Ignore the reload sources command until chronyd enters the normal
|
||||||
|
operation mode.
|
||||||
|
|
||||||
|
Fixes: 519796de3756 ("conf: add sourcedirs directive")
|
||||||
|
|
||||||
|
diff --git a/conf.c b/conf.c
|
||||||
|
index 6eae11c9..8849bdce 100644
|
||||||
|
--- a/conf.c
|
||||||
|
+++ b/conf.c
|
||||||
|
@@ -298,6 +298,8 @@ static ARR_Instance ntp_sources;
|
||||||
|
static ARR_Instance ntp_source_dirs;
|
||||||
|
/* Array of uint32_t corresponding to ntp_sources (for sourcedirs reload) */
|
||||||
|
static ARR_Instance ntp_source_ids;
|
||||||
|
+/* Flag indicating ntp_sources and ntp_source_ids are used for sourcedirs */
|
||||||
|
+static int conf_ntp_sources_added = 0;
|
||||||
|
|
||||||
|
/* Array of RefclockParameters */
|
||||||
|
static ARR_Instance refclock_sources;
|
||||||
|
@@ -1689,8 +1691,12 @@ reload_source_dirs(void)
|
||||||
|
NSR_Status s;
|
||||||
|
int d, pass;
|
||||||
|
|
||||||
|
+ /* Ignore reload command before adding configured sources */
|
||||||
|
+ if (!conf_ntp_sources_added)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
prev_size = ARR_GetSize(ntp_source_ids);
|
||||||
|
- if (prev_size > 0 && ARR_GetSize(ntp_sources) != prev_size)
|
||||||
|
+ if (ARR_GetSize(ntp_sources) != prev_size)
|
||||||
|
assert(0);
|
||||||
|
|
||||||
|
/* Save the current sources and their configuration IDs */
|
||||||
|
@@ -1859,7 +1865,10 @@ CNF_AddSources(void)
|
||||||
|
Free(source->params.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* The arrays will be used for sourcedir (re)loading */
|
||||||
|
ARR_SetSize(ntp_sources, 0);
|
||||||
|
+ ARR_SetSize(ntp_source_ids, 0);
|
||||||
|
+ conf_ntp_sources_added = 1;
|
||||||
|
|
||||||
|
reload_source_dirs();
|
||||||
|
}
|
||||||
|
diff --git a/test/simulation/203-initreload b/test/simulation/203-initreload
|
||||||
|
new file mode 100755
|
||||||
|
index 00000000..cf7924b8
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/simulation/203-initreload
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+#!/usr/bin/env bash
|
||||||
|
+
|
||||||
|
+. ./test.common
|
||||||
|
+
|
||||||
|
+check_config_h 'FEAT_CMDMON 1' || test_skip
|
||||||
|
+
|
||||||
|
+# Test fix "conf: don't load sourcedir during initstepslew and RTC init"
|
||||||
|
+
|
||||||
|
+test_start "reload during initstepslew"
|
||||||
|
+
|
||||||
|
+client_conf="initstepslew 5 192.168.123.1
|
||||||
|
+sourcedir tmp"
|
||||||
|
+client_server_conf="#"
|
||||||
|
+chronyc_conf="reload sources"
|
||||||
|
+chronyc_start=4
|
||||||
|
+
|
||||||
|
+echo 'server 192.168.123.1' > tmp/sources.sources
|
||||||
|
+
|
||||||
|
+run_test || test_fail
|
||||||
|
+check_chronyd_exit || test_fail
|
||||||
|
+check_source_selection || test_fail
|
||||||
|
+check_sync || test_fail
|
||||||
|
+
|
||||||
|
+check_log_messages "Added source 192\.168\.123\.1" 1 1 || test_fail
|
||||||
|
+
|
||||||
|
+test_pass
|
||||||
Loading…
Reference in new issue