interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the backoff time incrementally increase until the upstream starts working again

This commit is contained in:
Sara Dickinson 2017-09-08 17:28:37 +01:00
parent 10133a71f3
commit 42945cfc08
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/context.c
View File

@ -737,6 +737,16 @@ void _getdns_upstream_log(getdns_upstream *upstream, uint64_t system,
void void
upstream_backoff(getdns_upstream *upstream) { upstream_backoff(getdns_upstream *upstream) {
upstream->conn_state = GETDNS_CONN_BACKOFF; upstream->conn_state = GETDNS_CONN_BACKOFF;
/* Increase the backoff interval incrementally up to the tls_backoff_time*/
if (upstream->conn_backoff_interval < upstream->upstreams->tls_backoff_time) {
if (upstream->conn_backoff_interval < (UINT16_MAX-1)/2)
upstream->conn_backoff_interval *= 2;
else
upstream->conn_backoff_interval = upstream->upstreams->tls_backoff_time
}
if (upstream->conn_backoff_interval < upstream->upstreams->tls_backoff_time)
upstream->conn_retry_time = time(NULL) + upstream->conn_backoff_interval;
else
upstream->conn_retry_time = time(NULL) + upstream->upstreams->tls_backoff_time; upstream->conn_retry_time = time(NULL) + upstream->upstreams->tls_backoff_time;
upstream->total_responses = 0; upstream->total_responses = 0;
upstream->total_timeouts = 0; upstream->total_timeouts = 0;
@ -745,7 +755,7 @@ upstream_backoff(getdns_upstream *upstream) {
upstream->conn_shutdowns = 0; upstream->conn_shutdowns = 0;
upstream->conn_backoffs++; upstream->conn_backoffs++;
_getdns_upstream_log(upstream, GETDNS_LOG_UPSTREAM_STATS, GETDNS_LOG_DEBUG, _getdns_upstream_log(upstream, GETDNS_LOG_UPSTREAM_STATS, GETDNS_LOG_DEBUG,
"%-40s : !Backing off this upstream - Will retry as new upstream at %s", "%-40s : !Backing off this upstream - Will retry again at %s",
upstream->addr_str, upstream->addr_str,
asctime(gmtime(&upstream->conn_retry_time))); asctime(gmtime(&upstream->conn_retry_time)));
} }
@ -774,6 +784,14 @@ _getdns_upstream_reset(getdns_upstream *upstream)
upstream_backoff(upstream); upstream_backoff(upstream);
} }
/* If we didn't backoff it would be nice to reset the conn_backoff_interval
if the upstream is working well again otherwise it would get stuck at the
tls_backoff_time forever... How about */
if (upstream->conn_state != GETDNS_CONN_BACKOFF &&
upstream->responses_received > 1)
upstream->conn_backoff_interval = 1;
// Reset per connection counters // Reset per connection counters
upstream->queries_sent = 0; upstream->queries_sent = 0;
upstream->responses_received = 0; upstream->responses_received = 0;
@ -958,6 +976,7 @@ upstream_init(getdns_upstream *upstream,
upstream->conn_shutdowns = 0; upstream->conn_shutdowns = 0;
upstream->conn_setup_failed = 0; upstream->conn_setup_failed = 0;
upstream->conn_retry_time = 0; upstream->conn_retry_time = 0;
upstream->conn_backoff_interval = 1;
upstream->conn_backoffs = 0; upstream->conn_backoffs = 0;
upstream->total_responses = 0; upstream->total_responses = 0;
upstream->total_timeouts = 0; upstream->total_timeouts = 0;

1
src/context.h
View File

@ -170,6 +170,7 @@ typedef struct getdns_upstream {
size_t conn_shutdowns; size_t conn_shutdowns;
size_t conn_setup_failed; size_t conn_setup_failed;
time_t conn_retry_time; time_t conn_retry_time;
uint16_t conn_backoff_interval;
size_t conn_backoffs; size_t conn_backoffs;
size_t total_responses; size_t total_responses;
size_t total_timeouts; size_t total_timeouts;