mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#10266 Linked clients should also be tagged for closing

Browse Source
This commit is contained in:
Ondřej Kuzník 2024-08-19 14:05:44 +01:00 committed by Quanah Gibson-Mount
parent e101d0ecc1
commit 37edfeceaa
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/lloadd/connection.c
View File

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

44
servers/lloadd/upstream.c
View File

@ -52,9 +52,6 @@ linked_upstream_lost( LloadConnection *client )
int gentle = 1;
CONNECTION_LOCK(client);
assert( client->c_restricted >= LLOAD_OP_RESTRICTED_UPSTREAM );
assert( client->c_linked_upstream );
client->c_restricted = LLOAD_OP_NOT_RESTRICTED;
client->c_linked_upstream = NULL;
CONNECTION_UNLOCK(client);
@ -169,6 +166,47 @@ handle_unsolicited( LloadConnection *c, BerElement *ber )
CONNECTION_LOCK(c);
};
/* Let all clients unlink */
node = ldap_tavl_end( c->c_linked, TAVL_DIR_LEFT );
while ( node ) {
LloadConnection *client;
int cmp = 0;
/*
* The upstream is CLOSING so it won't get new clients in, but
* releasing c_mutex allows clients to unregister themselves.
*/
client = (LloadConnection *)node->avl_data;
while ( !acquire_ref( &client->c_refcnt ) ) {
node = ldap_tavl_next( node, TAVL_DIR_RIGHT );
if ( !node ) {
break;
}
client = node->avl_data;
}
if ( !node ) break;
CONNECTION_UNLOCK(c);
linked_upstream_lost( client );
CONNECTION_LOCK(c);
node = ldap_tavl_find3( c->c_linked, client, lload_upstream_entry_cmp, &cmp );
if ( node && cmp <= 0 ) {
TAvlnode *next = ldap_tavl_next( node, TAVL_DIR_RIGHT );
if ( client == node->avl_data ) {
ldap_tavl_delete( &c->c_linked, client, lload_upstream_entry_cmp );
}
node = next;
}
RELEASE_REF( client, c_refcnt, client->c_destroy );
}
if ( c->c_state == LLOAD_C_CLOSING && c->c_ops ) {
CONNECTION_UNLOCK(c);
} else {
CONNECTION_DESTROY(c);
}
out:
ber_free( ber, 1 );
if ( c->c_state == LLOAD_C_CLOSING && c->c_ops ) {