shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00
Code

timesyncd: wait before reconnecting to first server

Browse Source 
When all servers are exhausted, wait for one poll interval before trying
to connect again to the first server in the list. Also, keep increasing
the polling interval to make sure a client not getting any valid replies
will not send requests to any server more frequently than is allowed by
the maximum polling interval.
This commit is contained in:
Miroslav Lichvar 2014-08-27 16:47:24 +02:00 committed by Kay Sievers
parent cedc611207
commit 63463bf091
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/timesync/timesyncd-manager.c
View File

@ -875,6 +875,7 @@ int manager_connect(Manager *m) {
manager_set_server_name(m, m->current_server_name->names_next);
else {
ServerName *f;
bool restart = true;
/* Our current server name list is exhausted,
* let's find the next one to iterate. First
@ -891,6 +892,8 @@ int manager_connect(Manager *m) {
f = m->link_servers;
if (!f)
f = m->system_servers;
else
restart = false;
}
if (!f)
@ -902,6 +905,25 @@ int manager_connect(Manager *m) {
return 0;
}
if (restart && !m->exhausted_servers && m->poll_interval_usec) {
log_debug("Waiting after exhausting servers.");
r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + m->poll_interval_usec, 0, manager_retry_connect, m);
if (r < 0) {
log_error("Failed to create retry timer: %s", strerror(-r));
return r;
}
m->exhausted_servers = true;
/* Increase the polling interval */
if (m->poll_interval_usec < NTP_POLL_INTERVAL_MAX_SEC * USEC_PER_SEC)
m->poll_interval_usec *= 2;
return 0;
}
m->exhausted_servers = false;
manager_set_server_name(m, f);
}
@ -1042,7 +1064,7 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re
online = network_is_online();
/* check if the client is currently connected */
connected = m->server_socket >= 0 || m->resolve_query;
connected = m->server_socket >= 0 || m->resolve_query || m->exhausted_servers;
if (connected && !online) {
log_info("No network connectivity, watching for changes.");

1
src/timesync/timesyncd-manager.h
View File

@ -41,6 +41,7 @@ struct Manager {
LIST_HEAD(ServerName, fallback_servers);
RateLimit ratelimit;
bool exhausted_servers;
/* network */
sd_event_source *network_event_source;