faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: change auto_offline to trigger on failed transmissions

Browse source 
Instead of counting missing responses, switch to the offline state
immediately when sendmsg() fails.

This makes the option usable with servers and networks that may drop
packets, and the effect will be consistent with the onoffline command.
This commit is contained in:
Miroslav Lichvar 2018-05-24 17:29:15 +02:00
parent 8a57a28177
commit 7637faa0d0
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/chrony.conf.adoc
View file

@ -164,13 +164,12 @@ option can be specified. *chronyd* will not try to poll the server until it is
enabled to do so (by using the <<chronyc.adoc#online,*online*>> command in
*chronyc*).
*auto_offline*:::
With this option, the server will be assumed to have gone offline when two
requests have been sent to it without receiving a response. This option avoids
With this option, the server will be assumed to have gone offline when sending
a request fails, e.g. due to a missing route to the network. This option avoids
the need to run the <<chronyc.adoc#offline,*offline*>> command from *chronyc*
when disconnecting the network link, if it is safe to assume that the requests
and responses will not be dropped in the network, e.g. in a trusted local
network. (It will still be necessary to use the <<chronyc.adoc#online,*online*>>
command when the link has been established, to enable measurements to start.)
when disconnecting the network link. (It will still be necessary to use the
<<chronyc.adoc#online,*online*>> command when the link has been established, to
enable measurements to start.)
*prefer*:::
Prefer this source over sources without the *prefer* option.
*noselect*:::

14
ntp_core.c
View file

@ -89,8 +89,8 @@ struct NCR_Instance_Record {
int tx_suspended; /* Boolean indicating we can't transmit yet */
int auto_burst; /* If 1, initiate a burst on each poll */
int auto_offline; /* If 1, automatically go offline if server/peer
isn't responding */
int auto_offline; /* If 1, automatically go offline when requests
cannot be sent */
int local_poll; /* Log2 of polling interval at our end */
int remote_poll; /* Log2 of server/peer's polling interval (recovered
@ -1143,10 +1143,6 @@ transmit_timeout(void *arg)
break;
}
/* With auto_offline take the source offline on 2nd missed reply */
if (inst->auto_offline && inst->tx_count >= 2)
NCR_SetConnectivity(inst, SRC_OFFLINE);
if (inst->opmode == MD_OFFLINE) {
return;
}
@ -1230,6 +1226,10 @@ transmit_timeout(void *arg)
SRC_UpdateReachability(inst->source, 0);
}
/* With auto_offline take the source offline if sending failed */
if (!sent && inst->auto_offline)
NCR_SetConnectivity(inst, SRC_OFFLINE);
switch (inst->opmode) {
case MD_BURST_WAS_ONLINE:
/* When not reachable, don't stop online burst until sending succeeds */
@ -1239,6 +1239,8 @@ transmit_timeout(void *arg)
case MD_BURST_WAS_OFFLINE:
--inst->burst_total_samples_to_go;
break;
case MD_OFFLINE:
return;
default:
break;
}