upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9600 Do not hold locks while calling into back-monitor

Browse source
This commit is contained in:
Ondřej Kuzník 2021-09-23 10:17:18 +01:00
parent 8968d13163
commit 6cc6ec2f72
3 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
servers/lloadd/client.c
View file

@ -600,22 +600,29 @@ client_init(
} }
c->c_write_event = event; c->c_write_event = event;
CONNECTION_LOCK(c);
#ifdef BALANCER_MODULE
if ( lload_monitor_client_subsys ) {
acquire_ref( &c->c_refcnt );
CONNECTION_UNLOCK(c);
if ( lload_monitor_conn_entry_create(
c, lload_monitor_client_subsys ) ) {
CONNECTION_LOCK(c);
RELEASE_REF( c, c_refcnt, c->c_destroy );
goto fail;
}
CONNECTION_LOCK(c);
RELEASE_REF( c, c_refcnt, c->c_destroy );
}
#endif /* BALANCER_MODULE */
c->c_destroy = client_destroy; c->c_destroy = client_destroy;
c->c_unlink = client_unlink; c->c_unlink = client_unlink;
c->c_pdu_cb = handle_one_request; c->c_pdu_cb = handle_one_request;
CONNECTION_LOCK(c);
/* We only register the write event when we have data pending */ /* We only register the write event when we have data pending */
event_add( c->c_read_event, c->c_read_timeout ); event_add( c->c_read_event, c->c_read_timeout );
#ifdef BALANCER_MODULE
if ( lload_monitor_client_subsys &&
lload_monitor_conn_entry_create(
c, lload_monitor_client_subsys ) ) {
goto fail;
}
#endif /* BALANCER_MODULE */
checked_lock( &clients_mutex ); checked_lock( &clients_mutex );
LDAP_CIRCLEQ_INSERT_TAIL( &clients, c, c_next ); LDAP_CIRCLEQ_INSERT_TAIL( &clients, c, c_next );
checked_unlock( &clients_mutex ); checked_unlock( &clients_mutex );
@ -623,6 +630,14 @@ client_init(
return c; return c;
fail: fail:
if ( !IS_ALIVE( c, c_live ) ) {
/*
* Released while we were unlocked, it's scheduled for destruction
* already
*/
return NULL;
}
if ( c->c_write_event ) { if ( c->c_write_event ) {
event_free( c->c_write_event ); event_free( c->c_write_event );
c->c_write_event = NULL; c->c_write_event = NULL;

2
servers/lloadd/connection.c
View file

@ -522,7 +522,7 @@ lload_connection_close( LloadConnection *c, void *arg )
"marking connection connid=%lu closing\n", "marking connection connid=%lu closing\n",
c->c_connid ); c->c_connid );
/* We were approached from the connection list */ /* We were approached from the connection list or cn=monitor */
assert( IS_ALIVE( c, c_refcnt ) ); assert( IS_ALIVE( c, c_refcnt ) );
/* Need to acquire this first, even if we won't need it */ /* Need to acquire this first, even if we won't need it */

29
servers/lloadd/upstream.c
View file

@ -963,15 +963,26 @@ upstream_init( ber_socket_t s, LloadBackend *b )
/* We only add the write event when we have data pending */ /* We only add the write event when we have data pending */
c->c_write_event = event; c->c_write_event = event;
c->c_destroy = upstream_destroy;
c->c_unlink = upstream_unlink;
#ifdef BALANCER_MODULE #ifdef BALANCER_MODULE
if ( b->b_monitor && lload_monitor_conn_entry_create( c, b->b_monitor ) ) { if ( b->b_monitor ) {
goto fail; acquire_ref( &c->c_refcnt );
CONNECTION_UNLOCK(c);
checked_unlock( &b->b_mutex );
if ( lload_monitor_conn_entry_create( c, b->b_monitor ) ) {
RELEASE_REF( c, c_refcnt, c->c_destroy );
checked_lock( &b->b_mutex );
CONNECTION_LOCK(c);
goto fail;
}
checked_lock( &b->b_mutex );
CONNECTION_LOCK(c);
RELEASE_REF( c, c_refcnt, c->c_destroy );
} }
#endif /* BALANCER_MODULE */ #endif /* BALANCER_MODULE */
c->c_destroy = upstream_destroy;
c->c_unlink = upstream_unlink;
#ifdef HAVE_TLS #ifdef HAVE_TLS
if ( c->c_is_tls == LLOAD_CLEARTEXT ) { if ( c->c_is_tls == LLOAD_CLEARTEXT ) {
#endif /* HAVE_TLS */ #endif /* HAVE_TLS */
@ -1015,6 +1026,14 @@ upstream_init( ber_socket_t s, LloadBackend *b )
return c; return c;
fail: fail:
if ( !IS_ALIVE( c, c_live ) ) {
/*
* Released while we were unlocked, it's scheduled for destruction
* already
*/
return NULL;
}
if ( c->c_write_event ) { if ( c->c_write_event ) {
event_del( c->c_write_event ); event_del( c->c_write_event );
event_free( c->c_write_event ); event_free( c->c_write_event );