X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fconn.c;h=7fa6ce65b95bba29003f7a24c3ba4fc200112ccd;hb=8a197d1a6c4f43925adf0a1372651b529081f6ae;hp=eba59e52bd043c4b25d69e949199d380d3c82ec3;hpb=7aeac214402767b5368a566a891efc75e12d9ae0;p=openldap diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c index eba59e52bd..7fa6ce65b9 100644 --- a/servers/slapd/back-meta/conn.c +++ b/servers/slapd/back-meta/conn.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1999-2007 The OpenLDAP Foundation. + * Copyright 1999-2010 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * Portions Copyright 1999-2003 Howard Chu. * All rights reserved. @@ -139,12 +139,31 @@ meta_back_conndn_dup( * Debug stuff (got it from libavl) */ #if META_BACK_PRINT_CONNTREE > 0 +static void +meta_back_print( metaconn_t *mc, char *avlstr ) +{ + int i; + + fputs( "targets=[", stderr ); + for ( i = 0; i < mc->mc_info->mi_ntargets; i++ ) { + fputc( mc->mc_conns[ i ].msc_ld ? '*' : 'o', stderr); + } + fputc( ']', stderr ); + + fprintf( stderr, " mc=%p local=\"%s\" conn=%p refcnt=%d%s %s\n", + (void *)mc, + mc->mc_local_ndn.bv_val ? mc->mc_local_ndn.bv_val : "", + (void *)mc->mc_conn, + mc->mc_refcnt, + LDAP_BACK_CONN_TAINTED( mc ) ? " tainted" : "", + avlstr ); +} + static void meta_back_ravl_print( Avlnode *root, int depth ) { int i; - metaconn_t *mc; - + if ( root == 0 ) { return; } @@ -154,15 +173,11 @@ meta_back_ravl_print( Avlnode *root, int depth ) for ( i = 0; i < depth; i++ ) { fprintf( stderr, "-" ); } + fputc( ' ', stderr ); + + meta_back_print( (metaconn_t *)root->avl_data, + avl_bf2str( root->avl_bf ) ); - mc = (metaconn_t *)root->avl_data; - fprintf( stderr, "mc=%p local=\"%s\" conn=%p %s refcnt=%d%s\n", - (void *)mc, - mc->mc_local_ndn.bv_val ? mc->mc_local_ndn.bv_val : "", - (void *)mc->mc_conn, - avl_bf2str( root->avl_bf ), mc->mc_refcnt, - LDAP_BACK_CONN_TAINTED( mc ) ? " tainted" : "" ); - meta_back_ravl_print( root->avl_left, depth + 1 ); } @@ -192,11 +207,8 @@ meta_back_print_conntree( metainfo_t *mi, char *msg ) LDAP_TAILQ_FOREACH( mc, &mi->mi_conn_priv[ c ].mic_priv, mc_q ) { - fprintf( stderr, " [%d] mc=%p local=\"%s\" conn=%p refcnt=%d flags=0x%08x\n", - i, - (void *)mc, - mc->mc_local_ndn.bv_val ? mc->mc_local_ndn.bv_val : "", - (void *)mc->mc_conn, mc->mc_refcnt, mc->msc_mscflags ); + fprintf( stderr, " [%d] ", i ); + meta_back_print( mc, "" ); i++; } } @@ -277,11 +289,12 @@ meta_back_init_one_conn( * don't return the connection */ if ( mt->mt_isquarantined ) { slap_retry_info_t *ri = &mt->mt_quarantine; - int dont_retry = 1; + int dont_retry = 0; if ( mt->mt_quarantine.ri_interval ) { ldap_pvt_thread_mutex_lock( &mt->mt_quarantine_mutex ); - if ( mt->mt_isquarantined == LDAP_BACK_FQ_YES ) { + dont_retry = ( mt->mt_isquarantined > LDAP_BACK_FQ_NO ); + if ( dont_retry ) { dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL || slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] ); if ( !dont_retry ) { @@ -295,9 +308,10 @@ meta_back_init_one_conn( Debug( LDAP_DEBUG_ANY, "%s %s.\n", op->o_log_prefix, buf, 0 ); } + + mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING; } - mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING; } ldap_pvt_thread_mutex_unlock( &mt->mt_quarantine_mutex ); } @@ -404,13 +418,13 @@ retry_lock:; /* automatically chase referrals ("chase-referrals [{yes|no}]" statement) */ ldap_set_option( msc->msc_ld, LDAP_OPT_REFERRALS, - LDAP_BACK_CHASE_REFERRALS( mi ) ? LDAP_OPT_ON : LDAP_OPT_OFF ); + META_BACK_TGT_CHASE_REFERRALS( mt ) ? LDAP_OPT_ON : LDAP_OPT_OFF ); #ifdef HAVE_TLS /* start TLS ("tls [try-]{start|propagate}" statement) */ - if ( ( LDAP_BACK_USE_TLS( mi ) + if ( ( META_BACK_TGT_USE_TLS( mt ) || ( op->o_conn->c_is_tls - && LDAP_BACK_PROPAGATE_TLS( mi ) ) ) + && META_BACK_TGT_PROPAGATE_TLS( mt ) ) ) && !is_ldaps ) { #ifdef SLAP_STARTTLS_ASYNCHRONOUS @@ -512,7 +526,7 @@ retry:; * overlay, where the "uri" can be parsed out of a referral */ if ( rs->sr_err == LDAP_SERVER_DOWN || ( rs->sr_err != LDAP_SUCCESS - && LDAP_BACK_TLS_CRITICAL( mi ) ) ) + && META_BACK_TGT_TLS_CRITICAL( mt ) ) ) { #ifdef DEBUG_205 @@ -948,7 +962,8 @@ meta_back_candidates_get( Operation *op ) data = (void *)mc; ldap_pvt_thread_pool_setkey( op->o_threadctx, &meta_back_candidates_dummy, data, - meta_back_candidates_keyfree ); + meta_back_candidates_keyfree, + NULL, NULL ); } else { mi->mi_candidates = mc; @@ -1009,7 +1024,7 @@ meta_back_getconn( { metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private; metaconn_t *mc = NULL, - mc_curr = { 0 }; + mc_curr = {{ 0 }}; int cached = META_TARGET_NONE, i = META_TARGET_NONE, err = LDAP_SUCCESS, @@ -1153,8 +1168,14 @@ retry_lock:; LDAP_BACK_CONN_TAINTED_SET( mc ); LDAP_BACK_CONN_CACHED_CLEAR( mc ); - Debug( LDAP_DEBUG_TRACE, "%s meta_back_getconn: mc=%p conn=%ld expired (tainted).\n", - op->o_log_prefix, (void *)mc, LDAP_BACK_PCONN_ID( mc ) ); + if ( LogTest( LDAP_DEBUG_TRACE ) ) { + char buf[STRLENOF("4294967295U") + 1] = { 0 }; + mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) ); + + Debug( LDAP_DEBUG_TRACE, + "%s meta_back_getconn: mc=%p conn=%s expired (tainted).\n", + op->o_log_prefix, (void *)mc, buf ); + } } mc->mc_refcnt++; @@ -1611,7 +1632,7 @@ done:; } #if META_BACK_PRINT_CONNTREE > 0 - meta_back_print_conntree( mi, ">>> meta_back_getconn" ); + meta_back_print_conntree( mi, "<<< meta_back_getconn" ); #endif /* META_BACK_PRINT_CONNTREE */ ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex ); @@ -1639,10 +1660,14 @@ done:; default: LDAP_BACK_CONN_CACHED_CLEAR( mc ); - Debug( LDAP_DEBUG_ANY, - "%s meta_back_getconn: candidates=%d conn=%ld insert failed\n", - op->o_log_prefix, ncandidates, - LDAP_BACK_PCONN_ID( mc ) ); + if ( LogTest( LDAP_DEBUG_ANY ) ) { + char buf[STRLENOF("4294967295U") + 1] = { 0 }; + mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) ); + + Debug( LDAP_DEBUG_ANY, + "%s meta_back_getconn: candidates=%d conn=%s insert failed\n", + op->o_log_prefix, ncandidates, buf ); + } mc->mc_refcnt = 0; meta_back_conn_free( mc ); @@ -1656,16 +1681,24 @@ done:; } } - Debug( LDAP_DEBUG_TRACE, - "%s meta_back_getconn: candidates=%d conn=%ld inserted\n", - op->o_log_prefix, ncandidates, - LDAP_BACK_PCONN_ID( mc ) ); + if ( LogTest( LDAP_DEBUG_TRACE ) ) { + char buf[STRLENOF("4294967295U") + 1] = { 0 }; + mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) ); + + Debug( LDAP_DEBUG_TRACE, + "%s meta_back_getconn: candidates=%d conn=%s inserted\n", + op->o_log_prefix, ncandidates, buf ); + } } else { - Debug( LDAP_DEBUG_TRACE, - "%s meta_back_getconn: candidates=%d conn=%ld fetched\n", - op->o_log_prefix, ncandidates, - LDAP_BACK_PCONN_ID( mc ) ); + if ( LogTest( LDAP_DEBUG_TRACE ) ) { + char buf[STRLENOF("4294967295U") + 1] = { 0 }; + mi->mi_ldap_extra->connid2str( &mc->mc_base, buf, sizeof(buf) ); + + Debug( LDAP_DEBUG_TRACE, + "%s meta_back_getconn: candidates=%d conn=%s fetched\n", + op->o_log_prefix, ncandidates, buf ); + } } return mc;