ITS#8303 Track pending ops per a_metasingleconn_t

so that unused target connections can be properly reset.

diff --git a/servers/slapd/back-asyncmeta/add.c b/servers/slapd/back-asyncmeta/add.c
index 661c4fd1a5dee3511482e3a7110c7a02341a3dda..4ba92caec7c31f2811b66e616301f620362affcf 100644 (file)
--- a/servers/slapd/back-asyncmeta/add.c
+++ b/servers/slapd/back-asyncmeta/add.c
@@ -360,8 +360,9 @@ asyncmeta_back_add( Operation *op, SlapReply *rs )
                        assert( 0 );
                        break;
                }
+
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_one_listener(mc, candidates, candidate);
+       asyncmeta_start_one_listener(mc, candidates, bc, candidate);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;

diff --git a/servers/slapd/back-asyncmeta/back-asyncmeta.h b/servers/slapd/back-asyncmeta/back-asyncmeta.h
index 1d7bea18525be43d036798941906f078e797a84b..479fc30099ffe3e831138ca17afd8bfd305364cf 100644 (file)
--- a/servers/slapd/back-asyncmeta/back-asyncmeta.h
+++ b/servers/slapd/back-asyncmeta/back-asyncmeta.h
@@ -192,7 +192,7 @@ struct a_metatarget_t;
 typedef struct bm_context_t {
        LDAP_SLIST_ENTRY(bm_context_t) bc_next;
        time_t                  timeout;
-       time_t          stoptime;
+       time_t                  stoptime;
        ldap_back_send_t        sendok;
        ldap_back_send_t        retrying;
        int candidate_match;
@@ -202,7 +202,8 @@ typedef struct bm_context_t {
        int is_ok;
        SlapReply               rs;
        Operation               *op;
-       LDAPControl     **ctrls;
+       LDAPControl             **ctrls;
+       int                     *msgids;
        SlapReply               *candidates;
 } bm_context_t;
 
@@ -231,7 +232,7 @@ typedef struct a_metasingleconn_t {
        /* NOTE: lc_lcflags is redefined to msc_mscflags to reuse the macros
         * defined for back-ldap */
 #define        lc_lcflags              msc_mscflags
-
+       int msc_pending_ops;
        int msc_timeout_ops;
                /* Connection for the select */
        Connection *conn;
@@ -773,8 +774,8 @@ void
 asyncmeta_send_result(bm_context_t* bc, int error, char *text);
 
 int asyncmeta_new_bm_context(Operation *op, SlapReply *rs, bm_context_t **new_bc, int ntargets);
-int asyncmeta_start_listeners(a_metaconn_t *mc, SlapReply *candidates);
-int asyncmeta_start_one_listener(a_metaconn_t *mc, SlapReply *candidates, int candidate);
+int asyncmeta_start_listeners(a_metaconn_t *mc, SlapReply *candidates,  bm_context_t *bc);
+int asyncmeta_start_one_listener(a_metaconn_t *mc, SlapReply *candidates,  bm_context_t *bc, int candidate);
 
 meta_search_candidate_t
 asyncmeta_back_search_start(

diff --git a/servers/slapd/back-asyncmeta/candidates.c b/servers/slapd/back-asyncmeta/candidates.c
index 39a933b0f0977d5245edbb463fa8629cc245d77a..4086248dd159147fcd1e60f610fc93a63f94bdde 100644 (file)
--- a/servers/slapd/back-asyncmeta/candidates.c
+++ b/servers/slapd/back-asyncmeta/candidates.c
@@ -285,5 +285,6 @@ asyncmeta_clear_one_msc(
        msc->msc_time = 0;
        msc->msc_mscflags = 0;
        msc->msc_timeout_ops = 0;
+       msc->msc_pending_ops = 0;
        return 0;
 }

diff --git a/servers/slapd/back-asyncmeta/compare.c b/servers/slapd/back-asyncmeta/compare.c
index ee091f6f1ee04a9d7d246a005ef79e7c446e593e..3d71b8592b80940fbb1b0cd022c5f8766fbee6ae 100644 (file)
--- a/servers/slapd/back-asyncmeta/compare.c
+++ b/servers/slapd/back-asyncmeta/compare.c
@@ -285,7 +285,7 @@ asyncmeta_back_compare( Operation *op, SlapReply *rs )
                        break;
                }
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_one_listener(mc, candidates, candidate);
+       asyncmeta_start_one_listener(mc, candidates, bc, candidate);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;

diff --git a/servers/slapd/back-asyncmeta/conn.c b/servers/slapd/back-asyncmeta/conn.c
index a8268a15b5faebfb45c5c30487673b1796d87124..277b971388e637f44210416fc6e566dc4fa2d599 100644 (file)
--- a/servers/slapd/back-asyncmeta/conn.c
+++ b/servers/slapd/back-asyncmeta/conn.c
@@ -1295,16 +1295,19 @@ asyncmeta_get_next_mc( a_metainfo_t *mi )
        return mc;
 }
 
-int asyncmeta_start_listeners(a_metaconn_t *mc, SlapReply *candidates)
+int asyncmeta_start_listeners(a_metaconn_t *mc, SlapReply *candidates, bm_context_t *bc)
 {
        int i;
        for (i = 0; i < mc->mc_info->mi_ntargets; i++) {
-               asyncmeta_start_one_listener(mc, candidates, i);
+               asyncmeta_start_one_listener(mc, candidates, bc, i);
        }
        return LDAP_SUCCESS;
 }
 
-int asyncmeta_start_one_listener(a_metaconn_t *mc, SlapReply *candidates, int candidate)
+int asyncmeta_start_one_listener(a_metaconn_t *mc,
+                                SlapReply *candidates,
+                                bm_context_t *bc,
+                                int candidate)
 {
        a_metasingleconn_t *msc;
        ber_socket_t s;
@@ -1314,6 +1317,8 @@ int asyncmeta_start_one_listener(a_metaconn_t *mc, SlapReply *candidates, int ca
        if (msc->msc_ld == NULL || !META_IS_CANDIDATE( &candidates[ candidate ] )) {
                return LDAP_SUCCESS;
        }
+       bc->msgids[candidate] = candidates[candidate].sr_msgid;
+       msc->msc_pending_ops++;
        if ( msc->conn == NULL) {
                ldap_get_option( msc->msc_ld, LDAP_OPT_DESC, &s );
                if (s < 0) {

diff --git a/servers/slapd/back-asyncmeta/delete.c b/servers/slapd/back-asyncmeta/delete.c
index 5a0bbe05d5a6c50b54b86edd672ed0e8b81e0eeb..8d9f5e1aa5a6526cd14226465ea4fedb5f5d28f4 100644 (file)
--- a/servers/slapd/back-asyncmeta/delete.c
+++ b/servers/slapd/back-asyncmeta/delete.c
@@ -233,7 +233,7 @@ asyncmeta_back_delete( Operation *op, SlapReply *rs )
                        break;
                }
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_one_listener(mc, candidates, candidate);
+       asyncmeta_start_one_listener(mc, candidates, bc, candidate);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;

diff --git a/servers/slapd/back-asyncmeta/message_queue.c b/servers/slapd/back-asyncmeta/message_queue.c
index b00a91c098b6301be0da91bd0abc1c1b07a1bc8a..a6beee0a073437e21380d017f2723b411ec81ea1 100644 (file)
--- a/servers/slapd/back-asyncmeta/message_queue.c
+++ b/servers/slapd/back-asyncmeta/message_queue.c
@@ -281,7 +281,7 @@ static void asyncmeta_memctx_put(void *threadctx, void *memctx)
 int asyncmeta_new_bm_context(Operation *op, SlapReply *rs, bm_context_t **new_bc, int ntargets)
 {
        void *oldctx = op->o_tmpmemctx;
-
+       int i;
        /* prevent old memctx from being destroyed */
        slap_sl_mem_setctx(op->o_threadctx, NULL);
        /* create new memctx */
@@ -290,6 +290,10 @@ int asyncmeta_new_bm_context(Operation *op, SlapReply *rs, bm_context_t **new_bc
 
        (*new_bc)->op = asyncmeta_copy_op(op);
        (*new_bc)->candidates = op->o_tmpcalloc(ntargets, sizeof(SlapReply),op->o_tmpmemctx);
+       (*new_bc)->msgids = op->o_tmpcalloc(ntargets, sizeof(int),op->o_tmpmemctx);
+       for (i = 0; i < ntargets; i++) {
+               (*new_bc)->msgids[i] = META_MSGID_UNDEFINED;
+       }
        /* restore original memctx */
        slap_sl_mem_setctx(op->o_threadctx, oldctx);
        op->o_tmpmemctx = oldctx;
@@ -505,8 +509,15 @@ void
 asyncmeta_drop_bc(a_metaconn_t *mc, bm_context_t *bc)
 {
        bm_context_t *om;
+       int i;
        LDAP_SLIST_FOREACH( om, &mc->mc_om_list, bc_next ) {
                if (om == bc) {
+                       for (i = 0; i < mc->mc_info->mi_ntargets; i++)
+                       {
+                               if (bc->msgids[i] >= 0) {
+                                       mc->mc_conns[i].msc_pending_ops--;
+                               }
+                       }
                        LDAP_SLIST_REMOVE(&mc->mc_om_list, om, bm_context_t, bc_next);
                        mc->pending_ops--;
                        break;

diff --git a/servers/slapd/back-asyncmeta/meta_result.c b/servers/slapd/back-asyncmeta/meta_result.c
index 74ad42795c4c6ac5b1c217654d124e88c16118e6..2be30cadbeccf28d541c675868f5038c74b82210 100644 (file)
--- a/servers/slapd/back-asyncmeta/meta_result.c
+++ b/servers/slapd/back-asyncmeta/meta_result.c
@@ -1574,7 +1574,7 @@ again:
        for (j=0; j<ntargets; j++) {
                i++;
                if (i >= ntargets) i = 0;
-               if (!mc->mc_conns[i].msc_ldr) continue;
+               if (!mc->mc_conns[i].msc_ldr || mc->mc_conns[i].msc_pending_ops <= 0) continue;
                rc = ldap_result( mc->mc_conns[i].msc_ldr, LDAP_RES_ANY, LDAP_MSG_RECEIVED, &tv, &msg );
                msc = &mc->mc_conns[i];
                if (rc < 1) {
@@ -1715,6 +1715,9 @@ void* asyncmeta_timeout_loop(void *ctx, void *arg)
                                                a_metasingleconn_t *msc = &mc->mc_conns[j];
                                                a_metatarget_t     *mt = mi->mi_targets[j];
                                                msc->msc_timeout_ops++;
+                                               if (bc->msgids[j] >= 0) {
+                                                       msc->msc_pending_ops--;
+                                               }
                                                asyncmeta_back_cancel( mc, op,
                                                                       bc->candidates[ j ].sr_msgid, j );
                                                if (!META_BACK_TGT_QUARANTINE( mt ) ||
@@ -1741,13 +1744,14 @@ void* asyncmeta_timeout_loop(void *ctx, void *arg)
                        }
                }
 
-               if (!mc->pending_ops && mi->mi_idle_timeout) {
+               if (mi->mi_idle_timeout) {
                        for (j=0; j<mi->mi_ntargets; j++) {
                                a_metasingleconn_t *msc = &mc->mc_conns[j];
+                               if (msc->msc_pending_ops > 0) {
+                                       continue;
+                               }
                                if (msc->msc_ld && msc->msc_time > 0 && msc->msc_time + mi->mi_idle_timeout <= current_time) {
-                                       if (mc->mc_active < 1) {
-                                               asyncmeta_clear_one_msc(NULL, mc, j);
-                                       }
+                                       asyncmeta_clear_one_msc(NULL, mc, j);
                                }
                        }
                }

diff --git a/servers/slapd/back-asyncmeta/modify.c b/servers/slapd/back-asyncmeta/modify.c
index d80f793c13d6a23d846f293500b77f0908b390e1..32d6f3e99303bed77fdd8f2757ba887df01ad234 100644 (file)
--- a/servers/slapd/back-asyncmeta/modify.c
+++ b/servers/slapd/back-asyncmeta/modify.c
@@ -362,7 +362,7 @@ asyncmeta_back_modify( Operation *op, SlapReply *rs )
                        break;
                }
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_one_listener(mc, candidates, candidate);
+       asyncmeta_start_one_listener(mc, candidates, bc, candidate);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;

diff --git a/servers/slapd/back-asyncmeta/modrdn.c b/servers/slapd/back-asyncmeta/modrdn.c
index a3f729a7ec586efede27e71aff64509899277210..aa26cd9c42113b035112667cb6044d156c7f9c25 100644 (file)
--- a/servers/slapd/back-asyncmeta/modrdn.c
+++ b/servers/slapd/back-asyncmeta/modrdn.c
@@ -308,7 +308,7 @@ asyncmeta_back_modrdn( Operation *op, SlapReply *rs )
                        break;
                }
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_one_listener(mc, candidates, candidate);
+       asyncmeta_start_one_listener(mc, candidates, bc, candidate);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;

diff --git a/servers/slapd/back-asyncmeta/search.c b/servers/slapd/back-asyncmeta/search.c
index db7927bb51e8b08645ad9908e1568678f4caf63b..146ef869cf457b960e10baf8db1ce584a916ee0e 100644 (file)
--- a/servers/slapd/back-asyncmeta/search.c
+++ b/servers/slapd/back-asyncmeta/search.c
@@ -442,7 +442,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
                        initial_candidates = 0, candidate_match = 0,
                        needbind = 0;
        ldap_back_send_t        sendok = LDAP_BACK_SENDERR;
-       long            i;
+       long            i,j;
        int             is_ok = 0;
        void            *savepriv;
        SlapReply       *candidates = NULL;
@@ -484,8 +484,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
        for ( i = 0; i < mi->mi_ntargets; i++ ) {
                /* reset sr_msgid; it is used in most loops
                 * to check if that target is still to be considered */
-               candidates[ i ].sr_msgid = META_MSGID_UNDEFINED;
-
+               candidates[i].sr_msgid = META_MSGID_UNDEFINED;
                /* a target is marked as candidate by asyncmeta_getconn();
                 * if for any reason (an error, it's over or so) it is
                 * no longer active, sr_msgid is set to META_MSGID_IGNORE
@@ -673,7 +672,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
                goto finish;
        }
        ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
-       asyncmeta_start_listeners(mc, candidates);
+       asyncmeta_start_listeners(mc, candidates, bc);
        ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex);
 finish:
        return rs->sr_err;