shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-29 06:50:16 +03:00
Code

Merge pull request #19109 from poettering/resolved-transaction-log-tweaks

Browse Source 
resolved: minor tweaks to transaction logic and logging
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-03-31 10:47:12 +02:00 committed by GitHub
commit a93af34a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/resolve/resolved-dns-transaction.c
View File

@ -510,7 +510,7 @@ static void dns_transaction_retry(DnsTransaction *t, bool next_server) {
/* Retries the transaction as it is, possibly on a different server */
if (next_server)
if (next_server && t->scope->protocol == DNS_PROTOCOL_DNS)
log_debug("Retrying transaction %" PRIu16 ", after switching servers.", t->id);
else
log_debug("Retrying transaction %" PRIu16 ".", t->id);
@ -1510,7 +1510,10 @@ static int on_transaction_timeout(sd_event_source *s, usec_t usec, void *userdat
assert(s);
assert(t);
if (!t->initial_jitter_scheduled || t->initial_jitter_elapsed) {
if (t->initial_jitter_scheduled && !t->initial_jitter_elapsed) {
log_debug("Initial jitter phase for transaction %" PRIu16 " elapsed.", t->id);
t->initial_jitter_elapsed = true;
} else {
/* Timeout reached? Increase the timeout for the server used */
switch (t->scope->protocol) {
@ -1528,14 +1531,12 @@ static int on_transaction_timeout(sd_event_source *s, usec_t usec, void *userdat
assert_not_reached("Invalid DNS protocol.");
}
if (t->initial_jitter_scheduled)
t->initial_jitter_elapsed = true;
log_debug("Timeout reached on transaction %" PRIu16 ".", t->id);
}
log_debug("Timeout reached on transaction %" PRIu16 ".", t->id);
dns_transaction_retry(t, true); /* try a different server, but given this means packet loss, let's do
* so even if we already tried a bunch */
dns_transaction_retry(t, /* next_server= */ true); /* try a different server, but given this means
* packet loss, let's do so even if we already
* tried a bunch */
return 0;
}
@ -1928,8 +1929,8 @@ int dns_transaction_go(DnsTransaction *t) {
if (r <= 0)
return r;
log_debug("%s transaction %" PRIu16 " for <%s> scope %s on %s/%s (validate=%s).",
t->bypass ? "Bypass" : "Regular",
log_debug("Firing %s transaction %" PRIu16 " for <%s> scope %s on %s/%s (validate=%s).",
t->bypass ? "bypass" : "regular",
t->id,
dns_resource_key_to_string(dns_transaction_key(t), key_str, sizeof key_str),
dns_protocol_to_string(t->scope->protocol),
@ -1941,34 +1942,33 @@ int dns_transaction_go(DnsTransaction *t) {
IN_SET(t->scope->protocol, DNS_PROTOCOL_LLMNR, DNS_PROTOCOL_MDNS)) {
usec_t jitter, accuracy;
/* RFC 4795 Section 2.7 suggests all queries should be
* delayed by a random time from 0 to JITTER_INTERVAL. */
/* RFC 4795 Section 2.7 suggests all queries should be delayed by a random time from 0 to
* JITTER_INTERVAL. */
t->initial_jitter_scheduled = true;
random_bytes(&jitter, sizeof(jitter));
switch (t->scope->protocol) {
case DNS_PROTOCOL_LLMNR:
jitter %= LLMNR_JITTER_INTERVAL_USEC;
jitter = random_u64_range(LLMNR_JITTER_INTERVAL_USEC);
accuracy = LLMNR_JITTER_INTERVAL_USEC;
break;
case DNS_PROTOCOL_MDNS:
jitter %= MDNS_JITTER_RANGE_USEC;
jitter += MDNS_JITTER_MIN_USEC;
jitter = usec_add(random_u64_range(MDNS_JITTER_RANGE_USEC), MDNS_JITTER_MIN_USEC);
accuracy = MDNS_JITTER_RANGE_USEC;
break;
default:
assert_not_reached("bad protocol");
}
r = sd_event_add_time(
assert(!t->timeout_event_source);
r = sd_event_add_time_relative(
t->scope->manager->event,
&t->timeout_event_source,
clock_boottime_or_monotonic(),
ts + jitter, accuracy,
jitter, accuracy,
on_transaction_timeout, t);
if (r < 0)
return r;
@ -1979,7 +1979,10 @@ int dns_transaction_go(DnsTransaction *t) {
t->next_attempt_after = ts;
t->state = DNS_TRANSACTION_PENDING;
log_debug("Delaying %s transaction for " USEC_FMT "us.", dns_protocol_to_string(t->scope->protocol), jitter);
log_debug("Delaying %s transaction %" PRIu16 " for " USEC_FMT "us.",
dns_protocol_to_string(t->scope->protocol),
t->id,
jitter);
return 1;
}