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

ntp: restart resolving on online command

Browse source 
If the online command is received when the resolver is running, start
it again as soon as it finishes instead of waiting for the timer.

This should reduce the time needed to get all sources resolved on boot
if chronyd is started before the network is online and the chronyc
online command is issued before the first round of resolving can finish,
e.g. due to an unreachable DNS server in resolv.conf.
This commit is contained in:
Miroslav Lichvar 2021-02-24 13:04:27 +01:00
parent d898bd246b
commit dc22df93f5
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ntp_sources.c
View file

@ -107,6 +107,7 @@ struct UnresolvedSource {
static struct UnresolvedSource *unresolved_sources = NULL; static struct UnresolvedSource *unresolved_sources = NULL;
static int resolving_interval = 0; static int resolving_interval = 0;
static int resolving_restart = 0;
static SCH_TimeoutID resolving_id; static SCH_TimeoutID resolving_id;
static struct UnresolvedSource *resolving_source = NULL; static struct UnresolvedSource *resolving_source = NULL;
static NSR_SourceResolvingEndHandler resolving_end_handler = NULL; static NSR_SourceResolvingEndHandler resolving_end_handler = NULL;
@ -579,6 +580,13 @@ name_resolve_handler(DNS_Status status, int n_addrs, IPAddr *ip_addrs, void *any
if (status == DNS_Failure || UTI_IsIPReal(&us->address.ip_addr) || is_resolved(us)) if (status == DNS_Failure || UTI_IsIPReal(&us->address.ip_addr) || is_resolved(us))
remove_unresolved_source(us); remove_unresolved_source(us);
/* If a restart was requested and this was the last source in the list,
start with the first source again (if there still is one) */
if (!next && resolving_restart) {
next = unresolved_sources;
resolving_restart = 0;
}
resolving_source = next; resolving_source = next;
if (next) { if (next) {
@ -791,7 +799,7 @@ NSR_ResolveSources(void)
{ {
/* Try to resolve unresolved sources now */ /* Try to resolve unresolved sources now */
if (unresolved_sources) { if (unresolved_sources) {
/* Make sure no resolving is currently running */ /* Allow only one resolving to be running at a time */
if (!resolving_source) { if (!resolving_source) {
if (resolving_id != 0) { if (resolving_id != 0) {
SCH_RemoveTimeout(resolving_id); SCH_RemoveTimeout(resolving_id);
@ -799,6 +807,9 @@ NSR_ResolveSources(void)
resolving_interval--; resolving_interval--;
} }
resolve_sources(); resolve_sources();
} else {
/* Try again as soon as the current resolving ends */
resolving_restart = 1;
} }
} else { } else {
/* No unresolved sources, we are done */ /* No unresolved sources, we are done */