Merge pull request #1829 from jrha/metaconfig_chrony

ncm-metaconfig: Add chrony options for dealing with leap-second adjustments on time servers

Author: jrha

ncm-metaconfig/src/main/metaconfig/chrony/main.tt

@@ -8,6 +8,8 @@
 [%              pair.value.join("\n") %]
 [%          CASE ['makestep'] -%]
 makestep [%     pair.value.threshold %] [% pair.value.limit %]
+[%          CASE ['smoothtime'] -%]
+smoothtime [%     pair.value.max_freq %] [% pair.value.max_wander %] [% pair.value.leaponly ? 'leaponly' : '' %]
 [%          CASE ['network'] -%]
 [%              FOREACH entry IN pair.value -%]
 [%                  entry.action %] [% entry.host %]

ncm-metaconfig/src/main/metaconfig/chrony/pan/schema.pan

@@ -65,6 +65,20 @@ type chrony_service_network = {
     'host' : type_network_name
 };
 
+@documentation{
+    The smoothtime directive can be used to enable smoothing of the time that chronyd serves to its clients to make it
+    easier for them to track it and keep their clocks close together even when large offset or frequency corrections
+    are applied to the server’s clock, for example after being offline for a longer time.
+}
+type chrony_service_smoothtime = {
+    @{ Maximum frequency offset of the smoothed time to the tracked NTP time (in ppm) }
+    'max_freq' : double(0..100000)
+    @{ Maximum rate at which the frequency offset is allowed to change (in ppm per second) }
+    'max_wander' : double(0..100000)
+    @{ Only smooth leap seconds, ignore normal offset and frequency changes }
+    'leaponly' : boolean
+};
+
 @documentation{
     the crony.conf configuration
 }
@@ -81,4 +95,10 @@ type chrony_service = {
     'keyfile' ? absolute_file_path
     'logdir' ? absolute_file_path
     'leapsectz' ? string
+    @{ Select how errors caused by inerting leap seconds are corrected for }
+    'leapsecmode' ? choice('system', 'step', 'slew', 'ignore')
+    @{ Maximum rate at which chronyd is allowed to slew the time (in ppm), defaults to 83333.333 (i.e. 1000000/12)}
+    'maxslewrate' ? double(0..100000)
+    @{ Control smoothing of the time that chronyd serves to its clients }
+    'smoothtime' ? chrony_service_smoothtime
 };

ncm-metaconfig/src/main/metaconfig/chrony/tests/profiles/config.pan

@@ -19,3 +19,8 @@ prefix '/software/components/metaconfig/services/{/etc/chrony.conf}/contents';
 'driftfile' = '/var/lib/chrony/drift';
 'keyfile' = '/etc/chrony.keys';
 
+'leapsecmode' = 'slew';
+'maxslewrate' = 1000.0;
+'smoothtime/max_freq' = 400.0;
+'smoothtime/max_wander' = 0.001;
+'smoothtime/leaponly' = true;

ncm-metaconfig/src/main/metaconfig/chrony/tests/regexps/config/base

@@ -6,9 +6,12 @@ multiline
 ^driftfile /var/lib/chrony/drift$
 ^rtcsync$
 ^keyfile /etc/chrony.keys$
+^leapsecmode slew$
 ^makestep 0.1 3$
+^maxslewrate 1000$
 ^allow 127.0.0.1$
 ^deny 192.168.1.0/24$
 ^pool pool.ntp.org\s+maxsources 6\s+iburst $
 ^server ntp.date.org\s+iburst trust $
 ^server ntp2.date.org $
+^smoothtime 400 0.001 leaponly$