gracefully handle server down while initiating a search (ITS#4518)

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 0c788c7b1a7db28e17fd483a261bae28ad012efd..bd3f6983ddefe255508ee0881682868eab599d0b 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1233,6 +1233,7 @@ connection_operation( void *ctx, void *arg_v )
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex );
 
        op->o_threadctx = ctx;
+       op->o_tid = ldap_pvt_thread_pool_tid( ctx );
 
        switch ( tag ) {
        case LDAP_REQ_BIND:
@@ -2172,37 +2173,6 @@ static int connection_op_activate( Operation *op )
        return rc;
 }
 
-#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-static int connection_write( ber_socket_t s );
-static void *connection_write_thread( void *ctx, void *arg )
-{
-       return (void *)(long)connection_write((long)arg);
-}
-
-int connection_write_activate( ber_socket_t s )
-{
-       int rc;
-
-       /*
-        * suspend reading on this file descriptor until a connection processing
-        * thread write data on it. Otherwise the listener thread will repeatedly
-        * submit the same event on it to the pool.
-        */
-       slapd_clr_write( s, 0);
-
-       rc = ldap_pvt_thread_pool_submit( &connection_pool,
-               connection_write_thread, (void *)(long)s );
-
-       if( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "connection_write_activate(%d): submit failed (%d)\n",
-                       (int) s, rc, 0 );
-       }
-       return rc;
-}
-
-static
-#endif
 int connection_write(ber_socket_t s)
 {
        Connection *c;
@@ -2210,6 +2180,8 @@ int connection_write(ber_socket_t s)
 
        assert( connections != NULL );
 
+       slapd_clr_write( s, 0 );
+
        ldap_pvt_thread_mutex_lock( MCA_GET_CONN_MUTEX( s ) );
 
        c = connection_get( s );
@@ -2221,9 +2193,6 @@ int connection_write(ber_socket_t s)
                return -1;
        }
 
-#ifndef SLAP_LIGHTWEIGHT_DISPATCHER
-       slapd_clr_write( s, 0);
-#endif
        c->c_n_write++;
 
        Debug( LDAP_DEBUG_TRACE,
@@ -2285,6 +2254,7 @@ connection_fake_init(
        op->o_tmpmemctx = slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, ctx);
        op->o_tmpmfuncs = &slap_sl_mfuncs;
        op->o_threadctx = ctx;
+       op->o_tid = ldap_pvt_thread_pool_tid( ctx );
 
        op->o_conn = conn;
        op->o_connid = op->o_conn->c_connid;