--- servers/slapd/overlays/syncprov.c 2005/10/14 22:31:22 1.119 +++ servers/slapd/overlays/syncprov.c 2006/05/02 03:08:59 1.149 @@ -1,8 +1,8 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.118 2005/10/13 09:58:46 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.148 2006/04/28 01:06:47 hyc Exp $ */ /* syncprov.c - syncrepl provider */ /* This work is part of OpenLDAP Software . * - * Copyright 2004-2005 The OpenLDAP Foundation. + * Copyright 2004-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -383,6 +383,9 @@ findbase_cb( Operation *op, SlapReply *r return LDAP_SUCCESS; } +static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL }; +static struct berval generic_filterstr = BER_BVC("(objectclass=*)"); + static int syncprov_findbase( Operation *op, fbase_cookie *fc ) { @@ -422,6 +425,8 @@ syncprov_findbase( Operation *op, fbase_ fop.ors_tlimit = SLAP_NO_LIMIT; fop.ors_attrs = slap_anlist_no_attrs; fop.ors_attrsonly = 1; + fop.ors_filter = &generic_filter; + fop.ors_filterstr = generic_filterstr; fop.o_bd->bd_info = on->on_info->oi_orig; rc = fop.o_bd->be_search( &fop, &frs ); @@ -445,12 +450,10 @@ syncprov_findbase( Operation *op, fbase_ case LDAP_SCOPE_SUBTREE: fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ); break; -#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ) && !dn_match( fc->fdn, &fc->fss->s_base ); break; -#endif } } @@ -478,9 +481,11 @@ syncprov_findbase( Operation *op, fbase_ * CSN, and generate Present records for them. We always collect this result * in SyncID sets, even if there's only one match. */ -#define FIND_MAXCSN 1 -#define FIND_CSN 2 -#define FIND_PRESENT 3 +typedef enum find_csn_t { + FIND_MAXCSN = 1, + FIND_CSN = 2, + FIND_PRESENT = 3 +} find_csn_t; static int findmax_cb( Operation *op, SlapReply *rs ) @@ -503,7 +508,11 @@ findcsn_cb( Operation *op, SlapReply *rs { slap_callback *sc = op->o_callback; - if ( rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS ) { + /* We just want to know that at least one exists, so it's OK if + * we exceed the unchecked limit. + */ + if ( rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED || + (rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS )) { sc->sc_private = (void *)1; } return LDAP_SUCCESS; @@ -559,7 +568,7 @@ findpres_cb( Operation *op, SlapReply *r } static int -syncprov_findcsn( Operation *op, int mode ) +syncprov_findcsn( Operation *op, find_csn_t mode ) { slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; syncprov_info_t *si = on->on_bi.bi_private; @@ -576,10 +585,10 @@ syncprov_findcsn( Operation *op, int mod #else AttributeAssertion eq = { NULL, BER_BVNULL }; #endif - int i, rc = LDAP_SUCCESS; fpres_cookie pcookie; sync_control *srs = NULL; - int findcsn_retry = 1; + struct slap_limits_set fc_limits; + int i, rc = LDAP_SUCCESS, findcsn_retry = 1; if ( mode != FIND_MAXCSN ) { srs = op->o_controls[slap_cids.sc_LDAPsync]; @@ -630,6 +639,8 @@ again: /* On retry, look for <= */ } else { cf.f_choice = LDAP_FILTER_LE; + fop.ors_limit = &fc_limits; + fc_limits.lms_s_unchecked = 1; fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)", cf.f_av_value.bv_val ); } @@ -729,7 +740,8 @@ syncprov_free_syncop( syncops *so ) /* Send a persistent search response */ static int -syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, Entry **e, int mode) +syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, + Entry **e, int mode ) { slap_overinst *on = opc->son; @@ -809,7 +821,7 @@ syncprov_qplay( Operation *op, slap_over syncres *sr; Entry *e; opcookie opc; - int rc; + int rc = 0; opc.son = on; op->o_bd->bd_info = (BackendInfo *)on->on_info; @@ -885,7 +897,7 @@ syncprov_qtask( void *ctx, void *arg ) op->o_private = NULL; op->o_callback = NULL; - syncprov_qplay( op, on, so ); + (void)syncprov_qplay( op, on, so ); /* decrement use count... */ syncprov_free_syncop( so ); @@ -937,12 +949,14 @@ syncprov_qresp( opcookie *opc, syncops * so->s_flags |= PS_FIND_BASE; } if ( so->s_flags & PS_IS_DETACHED ) { + int wake=0; ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); if ( !so->s_qtask ) { so->s_qtask = ldap_pvt_runqueue_insert( &slapd_rq, RUNQ_INTERVAL, syncprov_qtask, so, "syncprov_qtask", so->s_op->o_conn->c_peer_name.bv_val ); ++so->s_inuse; + wake = 1; } else { if (!ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask ) && !so->s_qtask->next_sched.tv_sec ) { @@ -950,9 +964,12 @@ syncprov_qresp( opcookie *opc, syncops * ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 0 ); so->s_qtask->interval.tv_sec = RUNQ_INTERVAL; ++so->s_inuse; + wake = 1; } } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); + if ( wake ) + slap_wake_listener(); } ldap_pvt_thread_mutex_unlock( &so->s_mutex ); return LDAP_SUCCESS; @@ -1214,9 +1231,9 @@ syncprov_checkpoint( Operation *op, Slap syncprov_info_t *si = on->on_bi.bi_private; Modifications mod; Operation opm; + SlapReply rsm = { 0 }; struct berval bv[2]; slap_callback cb = {0}; - int manage = get_manageDSAit(op); mod.sml_values = bv; bv[1].bv_val = NULL; @@ -1236,8 +1253,12 @@ syncprov_checkpoint( Operation *op, Slap opm.o_req_ndn = op->o_bd->be_nsuffix[0]; opm.o_bd->bd_info = on->on_info->oi_orig; opm.o_managedsait = SLAP_CONTROL_NONCRITICAL; - opm.o_bd->be_modify( &opm, rs ); - opm.o_managedsait = manage; + SLAP_DBFLAGS( opm.o_bd ) |= SLAP_DBFLAG_NOLASTMOD; + opm.o_bd->be_modify( &opm, &rsm ); + SLAP_DBFLAGS( opm.o_bd ) ^= SLAP_DBFLAG_NOLASTMOD; + if ( mod.sml_next != NULL ) { + slap_mods_free( mod.sml_next, 1 ); + } } static void @@ -1257,7 +1278,7 @@ syncprov_add_slog( Operation *op, struct se->se_next = NULL; se->se_tag = op->o_tag; - se->se_uuid.bv_val = (char *)(se+1); + se->se_uuid.bv_val = (char *)(&se[1]); AC_MEMCPY( se->se_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len ); se->se_uuid.bv_len = opc->suuid.bv_len; @@ -1281,9 +1302,6 @@ syncprov_add_slog( Operation *op, struct sl->sl_mincsn.bv_len = se->se_csn.bv_len; ch_free( se ); sl->sl_num--; - if ( !sl->sl_head ) { - sl->sl_tail = NULL; - } } ldap_pvt_thread_mutex_unlock( &sl->sl_mutex ); } @@ -1328,7 +1346,7 @@ syncprov_playlog( Operation *op, SlapRep * unlock the list mutex. */ for ( se=sl->sl_head; se; se=se->se_next ) { - if ( ber_bvcmp( &se->se_csn, oldcsn ) < 0 ) continue; + if ( ber_bvcmp( &se->se_csn, oldcsn ) <= 0 ) continue; if ( ber_bvcmp( &se->se_csn, ctxcsn ) > 0 ) break; if ( se->se_tag == LDAP_REQ_DELETE ) { j = i; @@ -1413,6 +1431,7 @@ syncprov_playlog( Operation *op, SlapRep mf.f_av_value = uuids[i]; cb.sc_private = NULL; fop.ors_slimit = 1; + frs.sr_nentries = 0; rc = fop.o_bd->be_search( &fop, &frs ); /* If entry was not found, add to delete list */ @@ -1740,7 +1759,7 @@ syncprov_detach_op( Operation *op, synco op2->ors_filterstr.bv_val = ptr; strcpy( ptr, so->s_filterstr.bv_val ); op2->ors_filterstr.bv_len = so->s_filterstr.bv_len; - op2->ors_filter = str2filter( ptr ); + op2->ors_filter = filter_dup( op->ors_filter, NULL ); so->s_op = op2; /* Copy any cached group ACLs individually */ @@ -1762,6 +1781,9 @@ syncprov_detach_op( Operation *op, synco LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next ); so->s_flags |= PS_IS_DETACHED; ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + + /* Prevent anyone else from trying to send a result for this op */ + op->o_abandon = 1; } static int @@ -1784,15 +1806,28 @@ syncprov_search_response( Operation *op, return SLAP_CB_CONTINUE; } a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN ); + if ( a == NULL && rs->sr_operational_attrs != NULL ) { + a = attr_find( rs->sr_operational_attrs, slap_schema.si_ad_entryCSN ); + } if ( a ) { - /* Make sure entry is less than the snaphot'd contextCSN */ - if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 0 ) + /* Make sure entry is less than the snapshot'd contextCSN */ + if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 0 ) { + Debug( LDAP_DEBUG_SYNC, "Entry %s CSN %s greater than snapshot %s\n", + rs->sr_entry->e_name.bv_val, + a->a_nvals[0].bv_val, + ss->ss_ctxcsn.bv_val ); return LDAP_SUCCESS; + } /* Don't send the ctx entry twice */ if ( !BER_BVISNULL( &srs->sr_state.ctxcsn ) && - bvmatch( &a->a_nvals[0], &srs->sr_state.ctxcsn ) ) + bvmatch( &a->a_nvals[0], &srs->sr_state.ctxcsn ) ) { + Debug( LDAP_DEBUG_SYNC, "Entry %s CSN %s matches ctx %s\n", + rs->sr_entry->e_name.bv_val, + a->a_nvals[0].bv_val, + srs->sr_state.ctxcsn.bv_val ); return LDAP_SUCCESS; + } } rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2, op->o_tmpmemctx ); @@ -1877,10 +1912,12 @@ syncprov_op_search( Operation *op, SlapR /* syncprov_findbase expects to be called as a callback... */ sc.sc_private = &opc; opc.son = on; + ldap_pvt_thread_mutex_init( &so.s_mutex ); cb = op->o_callback; op->o_callback = ≻ rs->sr_err = syncprov_findbase( op, &fc ); op->o_callback = cb; + ldap_pvt_thread_mutex_destroy( &so.s_mutex ); if ( rs->sr_err != LDAP_SUCCESS ) { send_ldap_result( op, rs ); @@ -2139,6 +2176,13 @@ sp_cf_gen(ConfigArgs *c) rc = 1; } break; + case SP_USEHINT: + if ( si->si_usehint ) { + c->value_int = 1; + } else { + rc = 1; + } + break; } return rc; } else if ( c->op == LDAP_MOD_DELETE ) { @@ -2159,13 +2203,42 @@ sp_cf_gen(ConfigArgs *c) else rc = LDAP_NO_SUCH_ATTRIBUTE; break; + case SP_USEHINT: + if ( si->si_usehint ) + si->si_usehint = 0; + else + rc = LDAP_NO_SUCH_ATTRIBUTE; + break; } return rc; } switch ( c->type ) { case SP_CHKPT: - si->si_chkops = atoi( c->argv[1] ); - si->si_chktime = atoi( c->argv[2] ) * 60; + if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) { + sprintf( c->msg, "%s unable to parse checkpoint ops # \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chkops <= 0 ) { + sprintf( c->msg, "%s invalid checkpoint ops # \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) { + sprintf( c->msg, "%s unable to parse checkpoint time \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chktime <= 0 ) { + sprintf( c->msg, "%s invalid checkpoint time \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); + return ARG_BAD_CONF; + } + si->si_chktime *= 60; break; case SP_SESSL: { sessionlog *sl; @@ -2193,6 +2266,9 @@ sp_cf_gen(ConfigArgs *c) case SP_NOPRES: si->si_nopres = c->value_int; break; + case SP_USEHINT: + si->si_usehint = c->value_int; + break; } return rc; } @@ -2221,8 +2297,8 @@ syncprov_db_open( slap_overinst *on = (slap_overinst *) be->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; - Connection conn; - OperationBuffer opbuf; + Connection conn = { 0 }; + OperationBuffer opbuf = { 0 }; char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; Operation *op = (Operation *) &opbuf; Entry *e; @@ -2265,12 +2341,14 @@ syncprov_db_open( strcpy( ctxcsnbuf, si->si_ctxcsnbuf ); } be_entry_release_rw( op, e, 0 ); - op->o_bd->bd_info = (BackendInfo *)on; - op->o_req_dn = be->be_suffix[0]; - op->o_req_ndn = be->be_nsuffix[0]; - op->ors_scope = LDAP_SCOPE_SUBTREE; - ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op ); - ldap_pvt_thread_join( tid, NULL ); + if ( !BER_BVISEMPTY( &si->si_ctxcsn ) ) { + op->o_bd->bd_info = (BackendInfo *)on; + op->o_req_dn = be->be_suffix[0]; + op->o_req_ndn = be->be_nsuffix[0]; + op->ors_scope = LDAP_SCOPE_SUBTREE; + ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op ); + ldap_pvt_thread_join( tid, NULL ); + } } else if ( SLAP_SYNC_SHADOW( op->o_bd )) { /* If we're also a consumer, and we didn't find the context entry, * then don't generate anything, wait for our provider to send it @@ -2364,6 +2442,17 @@ syncprov_db_destroy( syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; if ( si ) { + if ( si->si_logs ) { + slog_entry *se = si->si_logs->sl_head; + + while ( se ) { + slog_entry *se_next = se->se_next; + ch_free( se ); + se = se_next; + } + + ch_free( si->si_logs ); + } ldap_pvt_thread_mutex_destroy( &si->si_mods_mutex ); ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex ); ldap_pvt_thread_mutex_destroy( &si->si_csn_mutex ); @@ -2440,6 +2529,7 @@ static int syncprov_parseCtrl ( rs->sr_text = "Sync control : cookie decoding error"; return LDAP_PROTOCOL_ERROR; } + tag = ber_peek_tag( ber, &len ); } if ( tag == LDAP_TAG_RELOAD_HINT ) { if (( ber_scanf( ber, /*{*/ "b", &rhint )) == LBER_ERROR ) { @@ -2481,12 +2571,12 @@ static int syncprov_parseCtrl ( static slap_overinst syncprov; int -syncprov_init() +syncprov_initialize() { int rc; rc = register_supported_control( LDAP_CONTROL_SYNC, - SLAP_CTRL_HIDE|SLAP_CTRL_SEARCH, NULL, + SLAP_CTRL_SEARCH, NULL, syncprov_parseCtrl, &slap_cids.sc_LDAPsync ); if ( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, @@ -2514,6 +2604,8 @@ syncprov_init() syncprov.on_bi.bi_cf_ocs = spocs; + generic_filter.f_desc = slap_schema.si_ad_objectClass; + rc = config_register_schema( spcfg, spocs ); if ( rc ) return rc; @@ -2524,7 +2616,7 @@ syncprov_init() int init_module( int argc, char *argv[] ) { - return syncprov_init(); + return syncprov_initialize(); } #endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */