Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
6b10c298
Commit
6b10c298
authored
Mar 28, 2018
by
Ondřej Kuzník
Browse files
Record pending DNS resolution to be able to cancel
parent
b039e7c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
servers/lloadd/backend.c
View file @
6b10c298
...
...
@@ -95,6 +95,7 @@ upstream_name_cb( int result, struct evutil_addrinfo *res, void *arg )
ldap_pvt_thread_mutex_lock
(
&
b
->
b_mutex
);
b
->
b_dns_req
=
NULL
;
if
(
result
||
!
res
)
{
Debug
(
LDAP_DEBUG_ANY
,
"upstream_name_cb: "
"name resolution failed for backend '%s': %s
\n
"
,
...
...
@@ -169,7 +170,9 @@ fail:
b
->
b_opening
--
;
b
->
b_failed
++
;
ldap_pvt_thread_mutex_unlock
(
&
b
->
b_mutex
);
backend_retry
(
b
);
if
(
result
!=
EVUTIL_EAI_CANCEL
)
{
backend_retry
(
b
);
}
if
(
res
)
{
evutil_freeaddrinfo
(
res
);
}
...
...
@@ -415,7 +418,9 @@ backend_connect( evutil_socket_t s, short what, void *arg )
hostname
=
b
->
b_host
;
ldap_pvt_thread_mutex_unlock
(
&
b
->
b_mutex
);
evdns_getaddrinfo
(
dnsbase
,
hostname
,
NULL
,
&
hints
,
upstream_name_cb
,
b
);
assert
(
b
->
b_dns_req
==
NULL
);
b
->
b_dns_req
=
evdns_getaddrinfo
(
dnsbase
,
hostname
,
NULL
,
&
hints
,
upstream_name_cb
,
b
);
return
;
fail:
...
...
@@ -483,6 +488,11 @@ backend_reset( LloadBackend *b )
CONNECTION_DESTROY
(
c
);
assert
(
!
c
);
}
if
(
b
->
b_dns_req
)
{
evdns_getaddrinfo_cancel
(
b
->
b_dns_req
);
b
->
b_dns_req
=
NULL
;
b
->
b_opening
--
;
}
}
void
...
...
servers/lloadd/lload.h
View file @
6b10c298
...
...
@@ -212,6 +212,8 @@ struct LloadBackend {
monitor_subsys_t
*
b_monitor
;
#endif
/* BALANCER_MODULE */
struct
evdns_getaddrinfo_request
*
b_dns_req
;
LDAP_CIRCLEQ_ENTRY
(
LloadBackend
)
b_next
;
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment