RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 18:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: DNS request retry counter used for retry only

Browse Source 
There are two types of retries when performing a DNS resolution:
1. retry because of a timeout
2. retry of the full sequence of requests (query types failover)

Before this patch, the 'resolution->try' counter was incremented
after each send of a DNS request, which does not cover the 2 cases
above.
This patch fix this behavior.
This commit is contained in:
Baptiste Assmann 2015-09-09 00:54:38 +02:00 committed by Willy Tarreau
parent 0453a1dd45
commit f778bb46d6
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/checks.c
View File

@ -2215,13 +2215,14 @@ int trigger_resolution(struct server *s)
resolution->qid.key = query_id;
resolution->step = RSLV_STEP_RUNNING;
resolution->query_type = DNS_RTYPE_ANY;
resolution->try = 0;
resolution->try = resolvers->resolve_retries;
resolution->try_cname = 0;
resolution->nb_responses = 0;
resolution->resolver_family_priority = s->resolver_family_priority;
eb32_insert(&resolvers->query_ids, &resolution->qid);
dns_send_query(resolution);
resolution->try -= 1;
/* update wakeup date if this resolution is the only one in the FIFO list */
if (dns_check_resolution_queue(resolvers) == 1) {

5
src/dns.c
View File

@ -305,7 +305,6 @@ int dns_send_query(struct dns_resolution *resolution)
}
/* update resolution */
resolution->try += 1;
resolution->nb_responses = 0;
resolution->last_sent_packet = now_ms;
@ -1103,7 +1102,7 @@ struct task *dns_process_resolve(struct task *t)
* if current resolution has been tried too many times and finishes in timeout
* we update its status and remove it from the list
*/
if (resolution->try >= resolvers->resolve_retries) {
if (resolution->try <= 0) {
/* clean up resolution information and remove from the list */
dns_reset_resolution(resolution);
@ -1111,6 +1110,8 @@ struct task *dns_process_resolve(struct task *t)
resolution->requester_error_cb(resolution, DNS_RESP_TIMEOUT);
}
resolution->try -= 1;
/* check current resolution status */
if (resolution->step == RSLV_STEP_RUNNING) {
/* resend the DNS query */

7
src/server.c
View File

@ -2132,7 +2132,8 @@ int snr_resolution_error_cb(struct dns_resolution *resolution, int error_code)
res_preferred_afinet = resolution->resolver_family_priority == AF_INET && resolution->query_type == DNS_RTYPE_A;
res_preferred_afinet6 = resolution->resolver_family_priority == AF_INET6 && resolution->query_type == DNS_RTYPE_AAAA;
if (qtype_any || res_preferred_afinet || res_preferred_afinet6) {
if ((qtype_any || res_preferred_afinet || res_preferred_afinet6)
|| (resolution->try > 0)) {
/* let's change the query type */
if (qtype_any) {
/* fallback from ANY to resolution preference */
@ -2149,6 +2150,10 @@ int snr_resolution_error_cb(struct dns_resolution *resolution, int error_code)
/* fallback from A to AAAA */
resolution->query_type = DNS_RTYPE_AAAA;
}
else {
resolution->try -= 1;
resolution->query_type = DNS_RTYPE_ANY;
}
dns_send_query(resolution);