--- servers/slapd/overlays/syncprov.c 2004/12/07 23:47:25 1.45 +++ servers/slapd/overlays/syncprov.c 2011/01/04 17:23:13 1.147.2.81 @@ -1,8 +1,8 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.44 2004/12/07 17:52:55 hyc Exp $ */ +/* $OpenLDAP$ */ /* syncprov.c - syncrepl provider */ /* This work is part of OpenLDAP Software . * - * Copyright 2004 The OpenLDAP Foundation. + * Copyright 2004-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,6 +25,12 @@ #include #include "lutil.h" #include "slap.h" +#include "config.h" +#include "ldap_rq.h" + +#ifdef LDAP_DEVEL +#define CHECK_CSN 1 +#endif /* A modify request on a particular entry */ typedef struct modinst { @@ -42,6 +48,7 @@ typedef struct modtarget { /* A queued result of a persistent search */ typedef struct syncres { struct syncres *s_next; + Entry *s_e; struct berval s_dn; struct berval s_ndn; struct berval s_uuid; @@ -56,10 +63,17 @@ typedef struct syncops { struct berval s_base; /* ndn of search base */ ID s_eid; /* entryID of search base */ Operation *s_op; /* search op */ - int s_sid; int s_rid; + int s_sid; struct berval s_filterstr; int s_flags; /* search status */ +#define PS_IS_REFRESHING 0x01 +#define PS_IS_DETACHED 0x02 +#define PS_WROTE_BASE 0x04 +#define PS_FIND_BASE 0x08 +#define PS_FIX_FILTER 0x10 +#define PS_TASK_QUEUED 0x20 + int s_inuse; /* reference count */ struct syncres *s_res; struct syncres *s_restail; @@ -83,8 +97,6 @@ typedef struct sync_control { #define SLAP_SYNC_PERSIST (LDAP_SYNC_RESERVED<o_tmpmemctx ); - - ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) ); - - entryuuid_bv = slog_e->sl_uuid; - - if ( send_cookie && cookie ) { - ber_printf( ber, "{eOON}", - entry_sync_state, &entryuuid_bv, cookie ); - } else { - ber_printf( ber, "{eON}", - entry_sync_state, &entryuuid_bv ); - } - - ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_STATE; - ctrls[num_ctrls]->ldctl_iscritical = (op->o_sync == SLAP_CONTROL_CRITICAL); - ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 ); - - ber_free_buf( ber ); - - if ( ret < 0 ) { - Debug( LDAP_DEBUG_TRACE, - "slap_build_sync_ctrl: ber_flatten2 failed\n", - 0, 0, 0 ); - send_ldap_error( op, rs, LDAP_OTHER, "internal error" ); - return ret; - } - - return LDAP_SUCCESS; -} -#endif - static int syncprov_sendinfo( Operation *op, @@ -416,36 +387,15 @@ findbase_cb( Operation *op, SlapReply *r * Just store whatever we got. */ if ( fc->fss->s_eid == NOID ) { - fc->fbase = 1; + fc->fbase = 2; fc->fss->s_eid = rs->sr_entry->e_id; ber_dupbv( &fc->fss->s_base, &rs->sr_entry->e_nname ); } else if ( rs->sr_entry->e_id == fc->fss->s_eid && dn_match( &rs->sr_entry->e_nname, &fc->fss->s_base )) { - /* OK, the DN is the same and the entryID is the same. Now - * see if the fdn resides in the scope. - */ + /* OK, the DN is the same and the entryID is the same. */ fc->fbase = 1; - switch ( fc->fss->s_op->ors_scope ) { - case LDAP_SCOPE_BASE: - fc->fscope = dn_match( fc->fdn, &rs->sr_entry->e_nname ); - break; - case LDAP_SCOPE_ONELEVEL: { - struct berval pdn; - dnParent( fc->fdn, &pdn ); - fc->fscope = dn_match( &pdn, &rs->sr_entry->e_nname ); - break; } - case LDAP_SCOPE_SUBTREE: - fc->fscope = dnIsSuffix( fc->fdn, &rs->sr_entry->e_nname ); - break; -#ifdef LDAP_SCOPE_SUBORDINATE - case LDAP_SCOPE_SUBORDINATE: - fc->fscope = dnIsSuffix( fc->fdn, &rs->sr_entry->e_nname ) && - !dn_match( fc->fdn, &rs->sr_entry->e_nname ); - break; -#endif - } } } if ( rs->sr_err != LDAP_SUCCESS ) { @@ -454,43 +404,77 @@ 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 ) { - opcookie *opc = op->o_callback->sc_private; - slap_overinst *on = opc->son; - syncprov_info_t *si = on->on_bi.bi_private; + /* Use basic parameters from syncrepl search, but use + * current op's threadctx / tmpmemctx + */ + ldap_pvt_thread_mutex_lock( &fc->fss->s_mutex ); + if ( fc->fss->s_flags & PS_FIND_BASE ) { + slap_callback cb = {0}; + Operation fop; + SlapReply frs = { REP_RESULT }; + int rc; - slap_callback cb = {0}; - Operation fop; - SlapReply frs = { REP_RESULT }; - int rc; + fc->fss->s_flags ^= PS_FIND_BASE; + ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex ); - fop = *op; + fop = *fc->fss->s_op; - cb.sc_response = findbase_cb; - cb.sc_private = fc; + fop.o_bd = fop.o_bd->bd_self; + fop.o_hdr = op->o_hdr; + fop.o_time = op->o_time; + fop.o_tincr = op->o_tincr; - fop.o_sync_mode &= SLAP_CONTROL_MASK; /* turn off sync mode */ - fop.o_callback = &cb; - fop.o_tag = LDAP_REQ_SEARCH; - fop.ors_scope = LDAP_SCOPE_BASE; - fop.ors_deref = fc->fss->s_op->ors_deref; - fop.ors_limit = NULL; - fop.ors_slimit = 1; - fop.ors_tlimit = SLAP_NO_LIMIT; - fop.ors_attrs = slap_anlist_no_attrs; - fop.ors_attrsonly = 1; - fop.ors_filter = fc->fss->s_op->ors_filter; - fop.ors_filterstr = fc->fss->s_op->ors_filterstr; + cb.sc_response = findbase_cb; + cb.sc_private = fc; - fop.o_req_ndn = fc->fss->s_op->o_req_ndn; + fop.o_sync_mode = 0; /* turn off sync mode */ + fop.o_managedsait = SLAP_CONTROL_CRITICAL; + fop.o_callback = &cb; + fop.o_tag = LDAP_REQ_SEARCH; + fop.ors_scope = LDAP_SCOPE_BASE; + fop.ors_limit = NULL; + fop.ors_slimit = 1; + 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 ); - fop.o_bd->bd_info = (BackendInfo *)on; + rc = fop.o_bd->be_search( &fop, &frs ); + } else { + ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex ); + fc->fbase = 1; + } - if ( fc->fbase ) return LDAP_SUCCESS; + /* After the first call, see if the fdn resides in the scope */ + if ( fc->fbase == 1 ) { + switch ( fc->fss->s_op->ors_scope ) { + case LDAP_SCOPE_BASE: + fc->fscope = dn_match( fc->fdn, &fc->fss->s_base ); + break; + case LDAP_SCOPE_ONELEVEL: { + struct berval pdn; + dnParent( fc->fdn, &pdn ); + fc->fscope = dn_match( &pdn, &fc->fss->s_base ); + break; } + case LDAP_SCOPE_SUBTREE: + fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ); + break; + case LDAP_SCOPE_SUBORDINATE: + fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ) && + !dn_match( fc->fdn, &fc->fss->s_base ); + break; + } + } + + if ( fc->fbase ) + return LDAP_SUCCESS; /* If entryID has changed, then the base of this search has * changed. Invalidate the psearch. @@ -506,16 +490,18 @@ syncprov_findbase( Operation *op, fbase_ * was not checkpointed at the previous shutdown. * * 2: when the current contextCSN is known and we have a sync cookie, we search - * for one entry with CSN <= the cookie CSN. (Used to search for =.) If an - * entry is found, the cookie CSN is valid, otherwise it is stale. + * for one entry with CSN = the cookie CSN. If not found, try <= cookie CSN. + * If an entry is found, the cookie CSN is valid, otherwise it is stale. * * 3: during a refresh phase, we search for all entries with CSN <= the cookie * 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 ) @@ -525,7 +511,8 @@ findmax_cb( Operation *op, SlapReply *rs Attribute *a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN ); - if ( a && ber_bvcmp( &a->a_vals[0], maxcsn )) { + if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 && + slap_parse_csn_sid( &a->a_vals[0] ) == slap_serverID ) { maxcsn->bv_len = a->a_vals[0].bv_len; strcpy( maxcsn->bv_val, a->a_vals[0].bv_val ); } @@ -538,7 +525,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; @@ -594,7 +585,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; @@ -602,56 +593,97 @@ syncprov_findcsn( Operation *op, int mod slap_callback cb = {0}; Operation fop; SlapReply frs = { REP_RESULT }; - char buf[LDAP_LUTIL_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")]; - char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; - struct berval fbuf, maxcsn; - Filter cf, af; - AttributeAssertion eq; - int i, rc = LDAP_SUCCESS; + char buf[LDAP_PVT_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")]; + char cbuf[LDAP_PVT_CSNSTR_BUFSIZE]; + struct berval maxcsn; + Filter cf; + AttributeAssertion eq = ATTRIBUTEASSERTION_INIT; fpres_cookie pcookie; - sync_control *srs; + sync_control *srs = NULL; + struct slap_limits_set fc_limits; + int i, rc = LDAP_SUCCESS, findcsn_retry = 1; + int maxid; if ( mode != FIND_MAXCSN ) { srs = op->o_controls[slap_cids.sc_LDAPsync]; - - if ( srs->sr_state.ctxcsn->bv_len >= LDAP_LUTIL_CSNSTR_BUFSIZE ) { - return LDAP_OTHER; - } } fop = *op; fop.o_sync_mode &= SLAP_CONTROL_MASK; /* turn off sync_mode */ + /* We want pure entries, not referrals */ + fop.o_managedsait = SLAP_CONTROL_CRITICAL; - fbuf.bv_val = buf; cf.f_ava = &eq; cf.f_av_desc = slap_schema.si_ad_entryCSN; + BER_BVZERO( &cf.f_av_value ); cf.f_next = NULL; fop.o_callback = &cb; fop.ors_limit = NULL; fop.ors_tlimit = SLAP_NO_LIMIT; fop.ors_filter = &cf; - fop.ors_filterstr = fbuf; + fop.ors_filterstr.bv_val = buf; +again: switch( mode ) { case FIND_MAXCSN: cf.f_choice = LDAP_FILTER_GE; - cf.f_av_value = si->si_ctxcsn; - fbuf.bv_len = sprintf( buf, "(entryCSN>=%s)", - cf.f_av_value.bv_val ); + /* If there are multiple CSNs, use the one with our serverID */ + for ( i=0; isi_numcsns; i++) { + if ( slap_serverID == si->si_sids[i] ) { + maxid = i; + break; + } + } + if ( i == si->si_numcsns ) { + /* No match: this is multimaster, and none of the content in the DB + * originated locally. Treat like no CSN. + */ + return LDAP_NO_SUCH_OBJECT; + } + cf.f_av_value = si->si_ctxcsn[maxid]; + fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ), + "(entryCSN>=%s)", cf.f_av_value.bv_val ); + if ( fop.ors_filterstr.bv_len >= sizeof( buf ) ) { + return LDAP_OTHER; + } fop.ors_attrsonly = 0; fop.ors_attrs = csn_anlist; fop.ors_slimit = SLAP_NO_LIMIT; cb.sc_private = &maxcsn; cb.sc_response = findmax_cb; + strcpy( cbuf, cf.f_av_value.bv_val ); maxcsn.bv_val = cbuf; - maxcsn.bv_len = 0; + maxcsn.bv_len = cf.f_av_value.bv_len; break; case FIND_CSN: - cf.f_choice = LDAP_FILTER_LE; - cf.f_av_value = *srs->sr_state.ctxcsn; - fbuf.bv_len = sprintf( buf, "(entryCSN<=%s)", - cf.f_av_value.bv_val ); + if ( BER_BVISEMPTY( &cf.f_av_value )) { + cf.f_av_value = srs->sr_state.ctxcsn[0]; + /* If there are multiple CSNs, use the smallest */ + for ( i=1; isr_state.numcsns; i++ ) { + if ( ber_bvcmp( &cf.f_av_value, &srs->sr_state.ctxcsn[i] ) + > 0 ) { + cf.f_av_value = srs->sr_state.ctxcsn[i]; + } + } + } + /* Look for exact match the first time */ + if ( findcsn_retry ) { + cf.f_choice = LDAP_FILTER_EQUALITY; + fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ), + "(entryCSN=%s)", cf.f_av_value.bv_val ); + /* On retry, look for <= */ + } else { + cf.f_choice = LDAP_FILTER_LE; + fop.ors_limit = &fc_limits; + memset( &fc_limits, 0, sizeof( fc_limits )); + fc_limits.lms_s_unchecked = 1; + fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ), + "(entryCSN<=%s)", cf.f_av_value.bv_val ); + } + if ( fop.ors_filterstr.bv_len >= sizeof( buf ) ) { + return LDAP_OTHER; + } fop.ors_attrsonly = 1; fop.ors_attrs = slap_anlist_no_attrs; fop.ors_slimit = 1; @@ -659,19 +691,11 @@ syncprov_findcsn( Operation *op, int mod cb.sc_response = findcsn_cb; break; case FIND_PRESENT: - af.f_choice = LDAP_FILTER_AND; - af.f_next = NULL; - af.f_and = &cf; - cf.f_choice = LDAP_FILTER_LE; - cf.f_av_value = *srs->sr_state.ctxcsn; - cf.f_next = op->ors_filter; - fop.ors_filter = ⁡ - filter2bv_x( &fop, fop.ors_filter, &fop.ors_filterstr ); + fop.ors_filter = op->ors_filter; + fop.ors_filterstr = op->ors_filterstr; fop.ors_attrsonly = 0; fop.ors_attrs = uuid_anlist; fop.ors_slimit = SLAP_NO_LIMIT; - /* We want pure entries, not referrals */ - fop.o_managedsait = SLAP_CONTROL_CRITICAL; cb.sc_private = &pcookie; cb.sc_response = findpres_cb; pcookie.num = 0; @@ -690,163 +714,410 @@ syncprov_findcsn( Operation *op, int mod break; } - fop.o_bd->bd_info = on->on_info->oi_orig; + fop.o_bd->bd_info = (BackendInfo *)on->on_info; fop.o_bd->be_search( &fop, &frs ); fop.o_bd->bd_info = (BackendInfo *)on; switch( mode ) { case FIND_MAXCSN: - if ( maxcsn.bv_len ) { - strcpy( si->si_ctxcsnbuf, maxcsn.bv_val ); - si->si_ctxcsn.bv_len = maxcsn.bv_len; + if ( ber_bvcmp( &si->si_ctxcsn[maxid], &maxcsn )) { +#ifdef CHECK_CSN + Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax; + assert( !syn->ssyn_validate( syn, &maxcsn )); +#endif + ber_bvreplace( &si->si_ctxcsn[maxid], &maxcsn ); + si->si_numops++; /* ensure a checkpoint */ } break; case FIND_CSN: /* If matching CSN was not found, invalidate the context. */ - if ( !cb.sc_private ) rc = LDAP_NO_SUCH_OBJECT; + if ( !cb.sc_private ) { + /* If we didn't find an exact match, then try for <= */ + if ( findcsn_retry ) { + findcsn_retry = 0; + goto again; + } + rc = LDAP_NO_SUCH_OBJECT; + } break; case FIND_PRESENT: op->o_tmpfree( pcookie.uuids, op->o_tmpmemctx ); - op->o_tmpfree( fop.ors_filterstr.bv_val, op->o_tmpmemctx ); break; } return rc; } -/* Queue a persistent search response if still in Refresh stage */ -static int -syncprov_qresp( opcookie *opc, syncops *so, int mode ) +/* Should find a place to cache these */ +static mutexint *get_mutexint() { - syncres *sr; + mutexint *mi = ch_malloc( sizeof( mutexint )); + ldap_pvt_thread_mutex_init( &mi->mi_mutex ); + mi->mi_int = 1; + return mi; +} - sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 + - opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 ); - sr->s_next = NULL; - sr->s_dn.bv_val = (char *)(sr + 1); - sr->s_mode = mode; - sr->s_isreference = opc->sreference; - sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val, opc->sdn.bv_val ); - *(sr->s_ndn.bv_val++) = '\0'; - sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val, opc->sndn.bv_val ); - *(sr->s_uuid.bv_val++) = '\0'; - sr->s_csn.bv_val = lutil_strcopy( sr->s_uuid.bv_val, opc->suuid.bv_val ); +static void inc_mutexint( mutexint *mi ) +{ + ldap_pvt_thread_mutex_lock( &mi->mi_mutex ); + mi->mi_int++; + ldap_pvt_thread_mutex_unlock( &mi->mi_mutex ); +} - if ( !so->s_res ) { - so->s_res = sr; - } else { - so->s_restail->s_next = sr; +/* return resulting counter */ +static int dec_mutexint( mutexint *mi ) +{ + int i; + ldap_pvt_thread_mutex_lock( &mi->mi_mutex ); + i = --mi->mi_int; + ldap_pvt_thread_mutex_unlock( &mi->mi_mutex ); + if ( !i ) { + ldap_pvt_thread_mutex_destroy( &mi->mi_mutex ); + ch_free( mi ); + } + return i; +} + +static void +syncprov_free_syncop( syncops *so ) +{ + syncres *sr, *srnext; + GroupAssertion *ga, *gnext; + + ldap_pvt_thread_mutex_lock( &so->s_mutex ); + if ( --so->s_inuse > 0 ) { + ldap_pvt_thread_mutex_unlock( &so->s_mutex ); + return; } - so->s_restail = sr; ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - return LDAP_SUCCESS; + if ( so->s_flags & PS_IS_DETACHED ) { + filter_free( so->s_op->ors_filter ); + for ( ga = so->s_op->o_groups; ga; ga=gnext ) { + gnext = ga->ga_next; + ch_free( ga ); + } + ch_free( so->s_op ); + } + ch_free( so->s_base.bv_val ); + for ( sr=so->s_res; sr; sr=srnext ) { + srnext = sr->s_next; + if ( sr->s_e ) { + if ( !dec_mutexint( sr->s_e->e_private )) { + sr->s_e->e_private = NULL; + entry_free( sr->s_e ); + } + } + ch_free( sr ); + } + ldap_pvt_thread_mutex_destroy( &so->s_mutex ); + ch_free( so ); } /* Send a persistent search response */ static int -syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, Entry *e, int mode, int queue ) +syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode ) { slap_overinst *on = opc->son; - syncprov_info_t *si = on->on_bi.bi_private; SlapReply rs = { REP_SEARCH }; LDAPControl *ctrls[2]; - struct berval cookie; + struct berval cookie = BER_BVNULL, csns[2]; Entry e_uuid = {0}; Attribute a_uuid = {0}; - Operation sop = *so->s_op; - Opheader ohdr; - ohdr = *sop.o_hdr; - sop.o_hdr = &ohdr; - sop.o_tmpmemctx = op->o_tmpmemctx; - sop.o_bd = op->o_bd; - sop.o_controls = op->o_controls; + if ( so->s_op->o_abandon ) + return SLAPD_ABANDON; - if ( queue && (so->s_flags & PS_IS_REFRESHING) ) { - ldap_pvt_thread_mutex_lock( &so->s_mutex ); - if ( so->s_flags & PS_IS_REFRESHING ) - return syncprov_qresp( opc, so, mode ); - ldap_pvt_thread_mutex_unlock( &so->s_mutex ); + ctrls[1] = NULL; + if ( !BER_BVISNULL( &opc->sctxcsn )) { + csns[0] = opc->sctxcsn; + BER_BVZERO( &csns[1] ); + slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 ); } - ctrls[1] = NULL; - slap_compose_sync_cookie( op, &cookie, &opc->sctxcsn, - so->s_sid, so->s_rid ); +#ifdef LDAP_DEBUG + if ( so->s_sid > 0 ) { + Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n", + so->s_sid, cookie.bv_val ? cookie.bv_val : "", 0 ); + } else { + Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n", + cookie.bv_val ? cookie.bv_val : "", 0, 0 ); + } +#endif e_uuid.e_attrs = &a_uuid; a_uuid.a_desc = slap_schema.si_ad_entryUUID; a_uuid.a_nvals = &opc->suuid; - rs.sr_err = syncprov_state_ctrl( &sop, &rs, &e_uuid, + rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid, mode, ctrls, 0, 1, &cookie ); + if ( !BER_BVISNULL( &cookie )) { + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); + } - rs.sr_entry = e; rs.sr_ctrls = ctrls; + rs.sr_entry = &e_uuid; + if ( mode == LDAP_SYNC_ADD || mode == LDAP_SYNC_MODIFY ) { + e_uuid = *opc->se; + e_uuid.e_private = NULL; + } + switch( mode ) { case LDAP_SYNC_ADD: - if ( opc->sreference ) { - rs.sr_ref = get_entry_referrals( &sop, e ); - send_search_reference( &sop, &rs ); + if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) { + rs.sr_ref = get_entry_referrals( op, rs.sr_entry ); + rs.sr_err = send_search_reference( op, &rs ); ber_bvarray_free( rs.sr_ref ); break; } /* fallthru */ case LDAP_SYNC_MODIFY: - rs.sr_attrs = sop.ors_attrs; - send_search_entry( &sop, &rs ); + rs.sr_attrs = op->ors_attrs; + rs.sr_err = send_search_entry( op, &rs ); break; case LDAP_SYNC_DELETE: e_uuid.e_attrs = NULL; e_uuid.e_name = opc->sdn; e_uuid.e_nname = opc->sndn; - rs.sr_entry = &e_uuid; - if ( opc->sreference ) { + if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) { struct berval bv = BER_BVNULL; rs.sr_ref = &bv; - send_search_reference( &sop, &rs ); + rs.sr_err = send_search_reference( op, &rs ); } else { - send_search_entry( &sop, &rs ); + rs.sr_err = send_search_entry( op, &rs ); } break; default: assert(0); } - op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx ); - rs.sr_ctrls = NULL; + /* In case someone else freed it already? */ + if ( rs.sr_ctrls ) { + int i; + for ( i=0; rs.sr_ctrls[i]; i++ ) { + if ( rs.sr_ctrls[i] == ctrls[0] ) { + op->o_tmpfree( ctrls[0]->ldctl_value.bv_val, op->o_tmpmemctx ); + ctrls[0]->ldctl_value.bv_val = NULL; + break; + } + } + rs.sr_ctrls = NULL; + } + return rs.sr_err; } static void -syncprov_free_syncop( syncops *so ) +syncprov_qstart( syncops *so ); + +/* Play back queued responses */ +static int +syncprov_qplay( Operation *op, syncops *so ) { - syncres *sr, *srnext; + slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key; + syncres *sr; + Entry *e; + opcookie opc; + int rc = 0; - ldap_pvt_thread_mutex_lock( &so->s_mutex ); - so->s_inuse--; - if ( so->s_inuse > 0 ) { + opc.son = on; + + do { + ldap_pvt_thread_mutex_lock( &so->s_mutex ); + sr = so->s_res; + if ( sr ) + so->s_res = sr->s_next; + if ( !so->s_res ) + so->s_restail = NULL; + /* Exit loop with mutex held */ + if ( !sr || so->s_op->o_abandon ) + break; ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - return; + + if ( sr->s_mode == LDAP_SYNC_NEW_COOKIE ) { + SlapReply rs = { REP_INTERMEDIATE }; + + rc = syncprov_sendinfo( op, &rs, LDAP_TAG_SYNC_NEW_COOKIE, + &sr->s_csn, 0, NULL, 0 ); + } else { + opc.sdn = sr->s_dn; + opc.sndn = sr->s_ndn; + opc.suuid = sr->s_uuid; + opc.sctxcsn = sr->s_csn; + opc.sreference = sr->s_isreference; + opc.se = sr->s_e; + + rc = syncprov_sendresp( op, &opc, so, sr->s_mode ); + + } + if ( sr->s_e ) { + if ( !dec_mutexint( sr->s_e->e_private )) { + sr->s_e->e_private = NULL; + entry_free ( sr->s_e ); + } + } + + ch_free( sr ); + + /* Exit loop with mutex held */ + ldap_pvt_thread_mutex_lock( &so->s_mutex ); + + } while (0); + + /* We now only send one change at a time, to prevent one + * psearch from hogging all the CPU. Resubmit this task if + * there are more responses queued and no errors occurred. + */ + + if ( rc == 0 && so->s_res ) { + syncprov_qstart( so ); + } else { + so->s_flags ^= PS_TASK_QUEUED; } + ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - filter_free( so->s_op->ors_filter ); - ch_free( so->s_op ); - ch_free( so->s_base.bv_val ); - for ( sr=so->s_res; sr; sr=srnext ) { - srnext = sr->s_next; - ch_free( sr ); + return rc; +} + +/* task for playing back queued responses */ +static void * +syncprov_qtask( void *ctx, void *arg ) +{ + syncops *so = arg; + OperationBuffer opbuf; + Operation *op; + BackendDB be; + int rc; + + op = &opbuf.ob_op; + *op = *so->s_op; + op->o_hdr = &opbuf.ob_hdr; + op->o_controls = opbuf.ob_controls; + memset( op->o_controls, 0, sizeof(opbuf.ob_controls) ); + + *op->o_hdr = *so->s_op->o_hdr; + + op->o_tmpmemctx = slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, ctx, 1); + op->o_tmpmfuncs = &slap_sl_mfuncs; + op->o_threadctx = ctx; + + /* syncprov_qplay expects a fake db */ + be = *so->s_op->o_bd; + be.be_flags |= SLAP_DBFLAG_OVERLAY; + op->o_bd = &be; + LDAP_SLIST_FIRST(&op->o_extra) = NULL; + op->o_callback = NULL; + + rc = syncprov_qplay( op, so ); + + /* decrement use count... */ + syncprov_free_syncop( so ); + + return NULL; +} + +/* Start the task to play back queued psearch responses */ +static void +syncprov_qstart( syncops *so ) +{ + so->s_flags |= PS_TASK_QUEUED; + so->s_inuse++; + ldap_pvt_thread_pool_submit( &connection_pool, + syncprov_qtask, so ); +} + +/* Queue a persistent search response */ +static int +syncprov_qresp( opcookie *opc, syncops *so, int mode ) +{ + syncres *sr; + int srsize; + struct berval cookie = opc->sctxcsn; + + if ( mode == LDAP_SYNC_NEW_COOKIE ) { + syncprov_info_t *si = opc->son->on_bi.bi_private; + + slap_compose_sync_cookie( NULL, &cookie, si->si_ctxcsn, + so->s_rid, slap_serverID ? slap_serverID : -1); } - ldap_pvt_thread_mutex_destroy( &so->s_mutex ); - ch_free( so ); + + srsize = sizeof(syncres) + opc->suuid.bv_len + 1 + + opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1; + if ( cookie.bv_len ) + srsize += cookie.bv_len + 1; + sr = ch_malloc( srsize ); + sr->s_next = NULL; + sr->s_e = opc->se; + /* bump refcount on this entry */ + if ( opc->se ) + inc_mutexint( opc->se->e_private ); + sr->s_dn.bv_val = (char *)(sr + 1); + sr->s_dn.bv_len = opc->sdn.bv_len; + sr->s_mode = mode; + sr->s_isreference = opc->sreference; + sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val, + opc->sdn.bv_val ) + 1; + sr->s_ndn.bv_len = opc->sndn.bv_len; + sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val, + opc->sndn.bv_val ) + 1; + sr->s_uuid.bv_len = opc->suuid.bv_len; + AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len ); + if ( cookie.bv_len ) { + sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1; + strcpy( sr->s_csn.bv_val, cookie.bv_val ); + } else { + sr->s_csn.bv_val = NULL; + } + sr->s_csn.bv_len = cookie.bv_len; + + if ( mode == LDAP_SYNC_NEW_COOKIE && cookie.bv_val ) { + ch_free( cookie.bv_val ); + } + + ldap_pvt_thread_mutex_lock( &so->s_mutex ); + if ( !so->s_res ) { + so->s_res = sr; + } else { + so->s_restail->s_next = sr; + } + so->s_restail = sr; + + /* If the base of the psearch was modified, check it next time round */ + if ( so->s_flags & PS_WROTE_BASE ) { + so->s_flags ^= PS_WROTE_BASE; + so->s_flags |= PS_FIND_BASE; + } + if (( so->s_flags & (PS_IS_DETACHED|PS_TASK_QUEUED)) == PS_IS_DETACHED ) { + syncprov_qstart( so ); + } + ldap_pvt_thread_mutex_unlock( &so->s_mutex ); + return LDAP_SUCCESS; } static int -syncprov_drop_psearch( syncops *so ) +syncprov_drop_psearch( syncops *so, int lock ) { - ldap_pvt_thread_mutex_lock( &so->s_op->o_conn->c_mutex ); - so->s_op->o_conn->c_n_ops_executing--; - so->s_op->o_conn->c_n_ops_completed++; - ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex ); + if ( so->s_flags & PS_IS_DETACHED ) { + if ( lock ) + ldap_pvt_thread_mutex_lock( &so->s_op->o_conn->c_mutex ); + so->s_op->o_conn->c_n_ops_executing--; + so->s_op->o_conn->c_n_ops_completed++; + LDAP_STAILQ_REMOVE( &so->s_op->o_conn->c_ops, so->s_op, Operation, + o_next ); + if ( lock ) + ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex ); + } syncprov_free_syncop( so ); + + return 0; +} + +static int +syncprov_ab_cleanup( Operation *op, SlapReply *rs ) +{ + slap_callback *sc = op->o_callback; + op->o_callback = sc->sc_next; + syncprov_drop_psearch( op->o_callback->sc_private, 0 ); + op->o_tmpfree( sc, op->o_tmpmemctx ); + return 0; } static int @@ -870,10 +1141,19 @@ syncprov_op_abandon( Operation *op, Slap if ( so ) { /* Is this really a Cancel exop? */ if ( op->o_tag != LDAP_REQ_ABANDON ) { + so->s_op->o_cancel = SLAP_CANCEL_ACK; rs->sr_err = LDAP_CANCELLED; send_ldap_result( so->s_op, rs ); + if ( so->s_flags & PS_IS_DETACHED ) { + slap_callback *cb; + cb = op->o_tmpcalloc( 1, sizeof(slap_callback), op->o_tmpmemctx ); + cb->sc_cleanup = syncprov_ab_cleanup; + cb->sc_next = op->o_callback; + cb->sc_private = so; + return SLAP_CB_CONTINUE; + } } - syncprov_drop_psearch( so ); + syncprov_drop_psearch( so, 0 ); } return SLAP_CB_CONTINUE; } @@ -887,11 +1167,12 @@ syncprov_matchops( Operation *op, opcook fbase_cookie fc; syncops *ss, *sprev, *snext; - Entry *e; + Entry *e = NULL; Attribute *a; int rc; struct berval newdn; int freefdn = 0; + BackendDB *b0 = op->o_bd, db; fc.fdn = &op->o_req_ndn; /* compute new DN */ @@ -904,37 +1185,76 @@ syncprov_matchops( Operation *op, opcook freefdn = 1; } if ( op->o_tag != LDAP_REQ_ADD ) { - op->o_bd->bd_info = (BackendInfo *)on->on_info; - rc = be_entry_get_rw( op, fc.fdn, NULL, NULL, 0, &e ); - op->o_bd->bd_info = (BackendInfo *)on; - if ( rc ) return; + if ( !SLAP_ISOVERLAY( op->o_bd )) { + db = *op->o_bd; + op->o_bd = &db; + } + rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on ); + /* If we're sending responses now, make a copy and unlock the DB */ + if ( e && !saveit ) { + if ( !opc->se ) { + opc->se = entry_dup( e ); + opc->se->e_private = get_mutexint(); + } + overlay_entry_release_ov( op, e, 0, on ); + e = opc->se; + } + if ( rc ) { + op->o_bd = b0; + return; + } } else { e = op->ora_e; + if ( !saveit ) { + if ( !opc->se ) { + opc->se = entry_dup( e ); + opc->se->e_private = get_mutexint(); + } + e = opc->se; + } } - /* Never replicate these */ - if ( is_entry_syncConsumerSubentry( e )) { - goto done; - } - if ( saveit ) { + if ( saveit || op->o_tag == LDAP_REQ_ADD ) { ber_dupbv_x( &opc->sdn, &e->e_name, op->o_tmpmemctx ); ber_dupbv_x( &opc->sndn, &e->e_nname, op->o_tmpmemctx ); opc->sreference = is_entry_referral( e ); - } - if ( saveit || op->o_tag == LDAP_REQ_ADD ) { a = attr_find( e->e_attrs, slap_schema.si_ad_entryUUID ); if ( a ) ber_dupbv_x( &opc->suuid, &a->a_nvals[0], op->o_tmpmemctx ); + } else if ( op->o_tag == LDAP_REQ_MODRDN && !saveit ) { + op->o_tmpfree( opc->sndn.bv_val, op->o_tmpmemctx ); + op->o_tmpfree( opc->sdn.bv_val, op->o_tmpmemctx ); + ber_dupbv_x( &opc->sdn, &e->e_name, op->o_tmpmemctx ); + ber_dupbv_x( &opc->sndn, &e->e_nname, op->o_tmpmemctx ); } ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss; sprev = ss, ss=snext) { + Operation op2; + Opheader oh; syncmatches *sm; int found = 0; snext = ss->s_next; + if ( ss->s_op->o_abandon ) + continue; + + /* Don't send ops back to the originator */ + if ( opc->osid > 0 && opc->osid == ss->s_sid ) { + Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping original sid %03x\n", + opc->osid, 0, 0 ); + continue; + } + + /* Don't send ops back to the messenger */ + if ( opc->rsid > 0 && opc->rsid == ss->s_sid ) { + Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping relayed sid %03x\n", + opc->rsid, 0, 0 ); + continue; + } + /* validate base */ fc.fss = ss; fc.fbase = 0; @@ -947,13 +1267,22 @@ syncprov_matchops( Operation *op, opcook send_ldap_error( ss->s_op, &rs, LDAP_SYNC_REFRESH_REQUIRED, "search base has changed" ); sprev->s_next = snext; - syncprov_drop_psearch( ss ); + syncprov_drop_psearch( ss, 1 ); + ss = sprev; continue; } /* If we're sending results now, look for this op in old matches */ if ( !saveit ) { syncmatches *old; + + /* Did we modify the search base? */ + if ( dn_match( &op->o_req_ndn, &ss->s_base )) { + ldap_pvt_thread_mutex_lock( &ss->s_mutex ); + ss->s_flags |= PS_WROTE_BASE; + ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); + } + for ( sm=opc->smatches, old=(syncmatches *)&opc->smatches; sm; old=sm, sm=sm->sm_next ) { if ( sm->sm_op == ss ) { @@ -965,35 +1294,78 @@ syncprov_matchops( Operation *op, opcook } } + if ( fc.fscope ) { + ldap_pvt_thread_mutex_lock( &ss->s_mutex ); + op2 = *ss->s_op; + oh = *op->o_hdr; + oh.oh_conn = ss->s_op->o_conn; + oh.oh_connid = ss->s_op->o_connid; + op2.o_bd = op->o_bd->bd_self; + op2.o_hdr = &oh; + op2.o_extra = op->o_extra; + op2.o_callback = NULL; + if (ss->s_flags & PS_FIX_FILTER) { + /* Skip the AND/GE clause that we stuck on in front. We + would lose deletes/mods that happen during the refresh + phase otherwise (ITS#6555) */ + op2.ors_filter = ss->s_op->ors_filter->f_and->f_next; + } + ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); + rc = test_filter( &op2, e, op2.ors_filter ); + } + + Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n", + ss->s_sid, fc.fscope, rc ); + /* check if current o_req_dn is in scope and matches filter */ - if ( fc.fscope && test_filter( op, e, ss->s_op->ors_filter ) == - LDAP_COMPARE_TRUE ) { + if ( fc.fscope && rc == LDAP_COMPARE_TRUE ) { if ( saveit ) { sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx ); sm->sm_next = opc->smatches; sm->sm_op = ss; - ss->s_inuse++; + ldap_pvt_thread_mutex_lock( &ss->s_mutex ); + ++ss->s_inuse; + ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); opc->smatches = sm; } else { /* if found send UPDATE else send ADD */ - syncprov_sendresp( op, opc, ss, e, - found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD, 1 ); + syncprov_qresp( opc, ss, + found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD ); } } else if ( !saveit && found ) { /* send DELETE */ - syncprov_sendresp( op, opc, ss, NULL, LDAP_SYNC_DELETE, 1 ); + syncprov_qresp( opc, ss, LDAP_SYNC_DELETE ); + } else if ( !saveit ) { + syncprov_qresp( opc, ss, LDAP_SYNC_NEW_COOKIE ); + } + if ( !saveit && found ) { + /* Decrement s_inuse, was incremented when called + * with saveit == TRUE + */ + syncprov_free_syncop( ss ); } } ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); -done: - if ( op->o_tag != LDAP_REQ_ADD ) { - op->o_bd->bd_info = (BackendInfo *)on->on_info; - be_entry_release_r( op, e ); - op->o_bd->bd_info = (BackendInfo *)on; + + if ( op->o_tag != LDAP_REQ_ADD && e ) { + if ( !SLAP_ISOVERLAY( op->o_bd )) { + op->o_bd = &db; + } + if ( saveit ) + overlay_entry_release_ov( op, e, 0, on ); + op->o_bd = b0; + } + if ( opc->se && !saveit ) { + if ( !dec_mutexint( opc->se->e_private )) { + opc->se->e_private = NULL; + entry_free( opc->se ); + opc->se = NULL; + } } if ( freefdn ) { op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx ); } + op->o_bd = b0; } static int @@ -1006,6 +1378,11 @@ syncprov_op_cleanup( Operation *op, Slap syncmatches *sm, *snext; modtarget *mt, mtdummy; + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + if ( si->si_active ) + si->si_active--; + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); + for (sm = opc->smatches; sm; sm=snext) { snext = sm->sm_next; syncprov_free_syncop( sm->sm_op ); @@ -1013,24 +1390,19 @@ syncprov_op_cleanup( Operation *op, Slap } /* Remove op from lock table */ - mtdummy.mt_op = op; - ldap_pvt_thread_mutex_lock( &si->si_mods_mutex ); - mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp ); - ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex ); + mt = opc->smt; if ( mt ) { - modinst *mi = mt->mt_mods; - - /* If there are more, promote the next one */ ldap_pvt_thread_mutex_lock( &mt->mt_mutex ); - if ( mi->mi_next ) { - mt->mt_mods = mi->mi_next; + mt->mt_mods = mt->mt_mods->mi_next; + /* If there are more, promote the next one */ + if ( mt->mt_mods ) { mt->mt_op = mt->mt_mods->mi_op; ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); } else { + ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); ldap_pvt_thread_mutex_lock( &si->si_mods_mutex ); avl_delete( &si->si_mods, mt, sp_avl_cmp ); ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex ); - ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); ldap_pvt_thread_mutex_destroy( &mt->mt_mutex ); ch_free( mt ); } @@ -1043,24 +1415,35 @@ syncprov_op_cleanup( Operation *op, Slap op->o_tmpfree( opc->sdn.bv_val, op->o_tmpmemctx ); op->o_callback = cb->sc_next; op->o_tmpfree(cb, op->o_tmpmemctx); + + return 0; } static void syncprov_checkpoint( Operation *op, SlapReply *rs, slap_overinst *on ) { - syncprov_info_t *si = on->on_bi.bi_private; + syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; Modifications mod; Operation opm; - struct berval bv[2]; - BackendInfo *orig; + SlapReply rsm = { 0 }; slap_callback cb = {0}; + BackendDB be; + BackendInfo *bi; - mod.sml_values = bv; - bv[1].bv_val = NULL; - bv[0] = si->si_ctxcsn; +#ifdef CHECK_CSN + Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax; + + int i; + for ( i=0; isi_numcsns; i++ ) { + assert( !syn->ssyn_validate( syn, si->si_ctxcsn+i )); + } +#endif + mod.sml_numvals = si->si_numcsns; + mod.sml_values = si->si_ctxcsn; mod.sml_nvalues = NULL; mod.sml_desc = slap_schema.si_ad_contextCSN; mod.sml_op = LDAP_MOD_REPLACE; + mod.sml_flags = SLAP_MOD_INTERNAL; mod.sml_next = NULL; cb.sc_response = slap_null_cb; @@ -1068,15 +1451,45 @@ syncprov_checkpoint( Operation *op, Slap opm.o_tag = LDAP_REQ_MODIFY; opm.o_callback = &cb; opm.orm_modlist = &mod; - opm.o_req_dn = op->o_bd->be_suffix[0]; - opm.o_req_ndn = op->o_bd->be_nsuffix[0]; - orig = opm.o_bd->bd_info; + opm.orm_no_opattrs = 1; + if ( SLAP_GLUE_SUBORDINATE( op->o_bd )) { + be = *on->on_info->oi_origdb; + opm.o_bd = &be; + } + opm.o_req_dn = si->si_contextdn; + opm.o_req_ndn = si->si_contextdn; + bi = opm.o_bd->bd_info; opm.o_bd->bd_info = on->on_info->oi_orig; - opm.o_bd->be_modify( &opm, rs ); + opm.o_managedsait = SLAP_CONTROL_NONCRITICAL; + opm.o_no_schema_check = 1; + opm.o_bd->be_modify( &opm, &rsm ); + + if ( rsm.sr_err == LDAP_NO_SUCH_OBJECT && + SLAP_SYNC_SUBENTRY( opm.o_bd )) { + const char *text; + char txtbuf[SLAP_TEXT_BUFLEN]; + size_t textlen = sizeof txtbuf; + Entry *e = slap_create_context_csn_entry( opm.o_bd, NULL ); + slap_mods2entry( &mod, &e, 0, 1, &text, txtbuf, textlen); + opm.ora_e = e; + opm.o_bd->be_add( &opm, &rsm ); + if ( e == opm.ora_e ) + be_entry_release_w( &opm, opm.ora_e ); + } + opm.o_bd->bd_info = bi; + + if ( mod.sml_next != NULL ) { + slap_mods_free( mod.sml_next, 1 ); + } +#ifdef CHECK_CSN + for ( i=0; isi_numcsns; i++ ) { + assert( !syn->ssyn_validate( syn, si->si_ctxcsn+i )); + } +#endif } static void -syncprov_add_slog( Operation *op, struct berval *csn ) +syncprov_add_slog( Operation *op ) { opcookie *opc = op->o_callback->sc_private; slap_overinst *on = opc->son; @@ -1084,40 +1497,68 @@ syncprov_add_slog( Operation *op, struct sessionlog *sl; slog_entry *se; - for ( sl = si->si_logs; sl; sl=sl->sl_next ) { + sl = si->si_logs; + { + if ( BER_BVISEMPTY( &op->o_csn ) ) { + /* During the syncrepl refresh phase we can receive operations + * without a csn. We cannot reliably determine the consumers + * state with respect to such operations, so we ignore them and + * wipe out anything in the log if we see them. + */ + ldap_pvt_thread_mutex_lock( &sl->sl_mutex ); + while ( se = sl->sl_head ) { + sl->sl_head = se->se_next; + ch_free( se ); + } + sl->sl_tail = NULL; + sl->sl_num = 0; + ldap_pvt_thread_mutex_unlock( &sl->sl_mutex ); + return; + } + /* Allocate a record. UUIDs are not NUL-terminated. */ se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len + - csn->bv_len + 1 ); + op->o_csn.bv_len + 1 ); se->se_next = NULL; se->se_tag = op->o_tag; - se->se_uuid.bv_val = (char *)(se+1); - se->se_csn.bv_val = se->se_uuid.bv_val + opc->suuid.bv_len + 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; - AC_MEMCPY( se->se_csn.bv_val, csn->bv_val, csn->bv_len ); - se->se_csn.bv_val[csn->bv_len] = '\0'; - se->se_csn.bv_len = csn->bv_len; + se->se_csn.bv_val = se->se_uuid.bv_val + opc->suuid.bv_len; + AC_MEMCPY( se->se_csn.bv_val, op->o_csn.bv_val, op->o_csn.bv_len ); + se->se_csn.bv_val[op->o_csn.bv_len] = '\0'; + se->se_csn.bv_len = op->o_csn.bv_len; + se->se_sid = slap_parse_csn_sid( &se->se_csn ); ldap_pvt_thread_mutex_lock( &sl->sl_mutex ); if ( sl->sl_head ) { - sl->sl_tail->se_next = se; + /* Keep the list in csn order. */ + if ( ber_bvcmp( &sl->sl_tail->se_csn, &se->se_csn ) <= 0 ) { + sl->sl_tail->se_next = se; + sl->sl_tail = se; + } else { + slog_entry **sep; + + for ( sep = &sl->sl_head; *sep; sep = &(*sep)->se_next ) { + if ( ber_bvcmp( &se->se_csn, &(*sep)->se_csn ) < 0 ) { + se->se_next = *sep; + *sep = se; + break; + } + } + } } else { sl->sl_head = se; + sl->sl_tail = se; } - sl->sl_tail = se; sl->sl_num++; while ( sl->sl_num > sl->sl_size ) { se = sl->sl_head; sl->sl_head = se->se_next; - strcpy( sl->sl_mincsn.bv_val, se->se_csn.bv_val ); - 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 ); } @@ -1136,13 +1577,19 @@ playlog_cb( Operation *op, SlapReply *rs /* enter with sl->sl_mutex locked, release before returning */ static void syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl, - struct berval *oldcsn, struct berval *ctxcsn ) + sync_control *srs, BerVarray ctxcsn, int numcsns, int *sids ) { slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; - syncprov_info_t *si = on->on_bi.bi_private; slog_entry *se; int i, j, ndel, num, nmods, mmods; + char cbuf[LDAP_PVT_CSNSTR_BUFSIZE]; BerVarray uuids; + struct berval delcsn[2]; + + if ( !sl->sl_num ) { + ldap_pvt_thread_mutex_unlock( &sl->sl_mutex ); + return; + } num = sl->sl_num; i = 0; @@ -1150,19 +1597,49 @@ syncprov_playlog( Operation *op, SlapRep uuids = op->o_tmpalloc( (num+1) * sizeof( struct berval ) + num * UUID_LEN, op->o_tmpmemctx ); - uuids[0].bv_val = (char *)(uuids + num + 1); + delcsn[0].bv_len = 0; + delcsn[0].bv_val = cbuf; + BER_BVZERO(&delcsn[1]); + /* Make a copy of the relevant UUIDs. Put the Deletes up front * and everything else at the end. Do this first so we can * unlock the list mutex. */ + Debug( LDAP_DEBUG_SYNC, "srs csn %s\n", + srs->sr_state.ctxcsn[0].bv_val, 0, 0 ); 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, ctxcsn ) > 0 ) break; + int k; + Debug( LDAP_DEBUG_SYNC, "log csn %s\n", se->se_csn.bv_val, 0, 0 ); + ndel = 1; + for ( k=0; ksr_state.numcsns; k++ ) { + if ( se->se_sid == srs->sr_state.sids[k] ) { + ndel = ber_bvcmp( &se->se_csn, &srs->sr_state.ctxcsn[k] ); + break; + } + } + if ( ndel <= 0 ) { + Debug( LDAP_DEBUG_SYNC, "cmp %d, too old\n", ndel, 0, 0 ); + continue; + } + ndel = 0; + for ( k=0; kse_sid == sids[k] ) { + ndel = ber_bvcmp( &se->se_csn, &ctxcsn[k] ); + break; + } + } + if ( ndel > 0 ) { + Debug( LDAP_DEBUG_SYNC, "cmp %d, too new\n", ndel, 0, 0 ); + break; + } if ( se->se_tag == LDAP_REQ_DELETE ) { j = i; i++; + AC_MEMCPY( cbuf, se->se_csn.bv_val, se->se_csn.bv_len ); + delcsn[0].bv_len = se->se_csn.bv_len; + delcsn[0].bv_val[delcsn[0].bv_len] = '\0'; } else { nmods++; j = num - nmods; @@ -1175,6 +1652,10 @@ syncprov_playlog( Operation *op, SlapRep ndel = i; + /* Zero out unused slots */ + for ( i=ndel; i < num - nmods; i++ ) + uuids[i].bv_len = 0; + /* Mods must be validated to see if they belong in this delete set. */ @@ -1203,7 +1684,7 @@ syncprov_playlog( Operation *op, SlapRep SlapReply frs = { REP_RESULT }; int rc; Filter mf, af; - AttributeAssertion eq; + AttributeAssertion eq = ATTRIBUTEASSERTION_INIT; slap_callback cb = {0}; fop = *op; @@ -1211,7 +1692,6 @@ syncprov_playlog( Operation *op, SlapRep fop.o_sync_mode = 0; fop.o_callback = &cb; fop.ors_limit = NULL; - fop.ors_slimit = 1; fop.ors_tlimit = SLAP_NO_LIMIT; fop.ors_attrs = slap_anlist_all_attributes; fop.ors_attrsonly = 0; @@ -1228,28 +1708,42 @@ syncprov_playlog( Operation *op, SlapRep fop.ors_filter = ⁡ cb.sc_response = playlog_cb; + fop.o_bd->bd_info = (BackendInfo *)on->on_info; - for ( i=0; ibd_info = on->on_info->oi_orig; + 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 ); - fop.o_bd->bd_info = (BackendInfo *)on; - op->o_tmpfree( fop.ors_filterstr.bv_val, op->o_tmpmemctx ); /* If entry was not found, add to delete list */ if ( !cb.sc_private ) { - uuids[ndel++] = uuids[num - 1 - i]; + uuids[ndel++] = uuids[i]; } } + fop.o_bd->bd_info = (BackendInfo *)on; } if ( ndel ) { + struct berval cookie; + + if ( delcsn[0].bv_len ) { + slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid, + slap_serverID ? slap_serverID : -1 ); + + Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 ); + } + uuids[ndel].bv_val = NULL; - syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, NULL, 0, uuids, 1 ); + syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, + delcsn[0].bv_len ? &cookie : NULL, 0, uuids, 1 ); + if ( delcsn[0].bv_len ) { + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); + } } + op->o_tmpfree( uuids, op->o_tmpmemctx ); } static int @@ -1262,44 +1756,159 @@ syncprov_op_response( Operation *op, Sla if ( rs->sr_err == LDAP_SUCCESS ) { - struct berval maxcsn = BER_BVNULL, curcsn = BER_BVNULL; - char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; + struct berval maxcsn; + char cbuf[LDAP_PVT_CSNSTR_BUFSIZE]; + int do_check = 0, have_psearches, foundit, csn_changed = 0; + + ldap_pvt_thread_mutex_lock( &si->si_resp_mutex ); /* Update our context CSN */ cbuf[0] = '\0'; - ldap_pvt_thread_mutex_lock( &si->si_csn_mutex ); - slap_get_commit_csn( op, &maxcsn, &curcsn ); - if ( !BER_BVISNULL( &maxcsn ) ) { - strcpy( cbuf, maxcsn.bv_val ); - if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn ) > 0 ) { - strcpy( si->si_ctxcsnbuf, cbuf ); - si->si_ctxcsn.bv_len = maxcsn.bv_len; + maxcsn.bv_val = cbuf; + maxcsn.bv_len = sizeof(cbuf); + ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock ); + + slap_get_commit_csn( op, &maxcsn, &foundit ); + if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) { + /* syncrepl queues the CSN values in the db where + * it is configured , not where the changes are made. + * So look for a value in the glue db if we didn't + * find any in this db. + */ + BackendDB *be = op->o_bd; + op->o_bd = select_backend( &be->be_nsuffix[0], 1); + maxcsn.bv_val = cbuf; + maxcsn.bv_len = sizeof(cbuf); + slap_get_commit_csn( op, &maxcsn, &foundit ); + op->o_bd = be; + } + if ( !BER_BVISEMPTY( &maxcsn ) ) { + int i, sid; +#ifdef CHECK_CSN + Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax; + assert( !syn->ssyn_validate( syn, &maxcsn )); +#endif + sid = slap_parse_csn_sid( &maxcsn ); + for ( i=0; isi_numcsns; i++ ) { + if ( sid == si->si_sids[i] ) { + if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn[i] ) > 0 ) { + ber_bvreplace( &si->si_ctxcsn[i], &maxcsn ); + csn_changed = 1; + } + break; + } + } + /* It's a new SID for us */ + if ( i == si->si_numcsns ) { + value_add_one( &si->si_ctxcsn, &maxcsn ); + csn_changed = 1; + si->si_numcsns++; + si->si_sids = ch_realloc( si->si_sids, si->si_numcsns * + sizeof(int)); + si->si_sids[i] = sid; } } - si->si_numops++; - if ( si->si_chkops || si->si_chktime ) { - int do_check=0; - if ( si->si_chkops && si->si_numops >= si->si_chkops ) { - do_check = 1; - si->si_numops = 0; + /* Don't do any processing for consumer contextCSN updates */ + if ( op->o_dont_replicate ) { + if ( op->o_tag == LDAP_REQ_MODIFY && + op->orm_modlist->sml_op == LDAP_MOD_REPLACE && + op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) { + /* Catch contextCSN updates from syncrepl. We have to look at + * all the attribute values, as there may be more than one csn + * that changed, and only one can be passed in the csn queue. + */ + Modifications *mod = op->orm_modlist; + int i, j, sid; + + for ( i=0; isml_numvals; i++ ) { + sid = slap_parse_csn_sid( &mod->sml_values[i] ); + for ( j=0; jsi_numcsns; j++ ) { + if ( sid == si->si_sids[j] ) { + if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) { + ber_bvreplace( &si->si_ctxcsn[j], &mod->sml_values[i] ); + csn_changed = 1; + } + break; + } + } + + if ( j == si->si_numcsns ) { + value_add_one( &si->si_ctxcsn, &mod->sml_values[i] ); + si->si_numcsns++; + si->si_sids = ch_realloc( si->si_sids, si->si_numcsns * + sizeof(int)); + si->si_sids[j] = sid; + csn_changed = 1; + } + } + if ( csn_changed ) + si->si_dirty = 0; + ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock ); + + if ( csn_changed ) { + syncops *ss; + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + for ( ss = si->si_ops; ss; ss = ss->s_next ) { + if ( ss->s_op->o_abandon ) + continue; + /* Send the updated csn to all syncrepl consumers, + * including the server from which it originated. + * The syncrepl consumer and syncprov provider on + * the originating server may be configured to store + * their csn values in different entries. + */ + syncprov_qresp( opc, ss, LDAP_SYNC_NEW_COOKIE ); + } + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); } - if ( si->si_chktime && - (op->o_time - si->si_chklast >= si->si_chktime )) { - do_check = 1; - si->si_chklast = op->o_time; + } else { + ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock ); } - if ( do_check ) { - syncprov_checkpoint( op, rs, on ); + goto leave; + } + + si->si_numops++; + if ( si->si_chkops || si->si_chktime ) { + /* Never checkpoint adding the context entry, + * it will deadlock + */ + if ( op->o_tag != LDAP_REQ_ADD || + !dn_match( &op->o_req_ndn, &si->si_contextdn )) { + if ( si->si_chkops && si->si_numops >= si->si_chkops ) { + do_check = 1; + si->si_numops = 0; + } + if ( si->si_chktime && + (op->o_time - si->si_chklast >= si->si_chktime )) { + if ( si->si_chklast ) { + do_check = 1; + si->si_chklast = op->o_time; + } else { + si->si_chklast = 1; + } + } } } - ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex ); + si->si_dirty = !csn_changed; + ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock ); - opc->sctxcsn.bv_len = maxcsn.bv_len; - opc->sctxcsn.bv_val = cbuf; + if ( do_check ) { + ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock ); + syncprov_checkpoint( op, rs, on ); + ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock ); + } + + /* only update consumer ctx if this is a newer csn */ + if ( csn_changed ) { + opc->sctxcsn = maxcsn; + } /* Handle any persistent searches */ - if ( si->si_ops ) { + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + have_psearches = ( si->si_ops != NULL ); + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); + if ( have_psearches ) { switch(op->o_tag) { case LDAP_REQ_ADD: case LDAP_REQ_MODIFY: @@ -1311,23 +1920,20 @@ syncprov_op_response( Operation *op, Sla /* for each match in opc->smatches: * send DELETE msg */ - ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); for ( sm = opc->smatches; sm; sm=sm->sm_next ) { if ( sm->sm_op->s_op->o_abandon ) continue; - syncprov_sendresp( op, opc, sm->sm_op, NULL, - LDAP_SYNC_DELETE, 1 ); + syncprov_qresp( opc, sm->sm_op, LDAP_SYNC_DELETE ); } - ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); break; } } /* Add any log records */ if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) { - syncprov_add_slog( op, &curcsn ); + syncprov_add_slog( op ); } - +leave: ldap_pvt_thread_mutex_unlock( &si->si_resp_mutex ); } return SLAP_CB_CONTINUE; } @@ -1343,24 +1949,23 @@ syncprov_op_compare( Operation *op, Slap syncprov_info_t *si = on->on_bi.bi_private; int rc = SLAP_CB_CONTINUE; - if ( dn_match( &op->o_req_ndn, op->o_bd->be_nsuffix ) && + if ( dn_match( &op->o_req_ndn, &si->si_contextdn ) && op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_contextCSN ) { Entry e = {0}; Attribute a = {0}; - struct berval bv[2]; - - e.e_name = op->o_bd->be_suffix[0]; - e.e_nname = op->o_bd->be_nsuffix[0]; - BER_BVZERO( &bv[1] ); - bv[0] = si->si_ctxcsn; + e.e_name = si->si_contextdn; + e.e_nname = si->si_contextdn; + e.e_attrs = &a; a.a_desc = slap_schema.si_ad_contextCSN; - a.a_vals = bv; - a.a_nvals = a.a_vals; - ldap_pvt_thread_mutex_lock( &si->si_csn_mutex ); + ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock ); + + a.a_vals = si->si_ctxcsn; + a.a_nvals = a.a_vals; + a.a_numvals = si->si_numcsns; rs->sr_err = access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc, &op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL ); @@ -1379,17 +1984,17 @@ syncprov_op_compare( Operation *op, Slap rs->sr_err = LDAP_COMPARE_FALSE; - if ( value_find_ex( op->oq_compare.rs_ava->aa_desc, + if ( attr_valfind( &a, SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH, - a.a_nvals, &op->oq_compare.rs_ava->aa_value, op->o_tmpmemctx ) == 0 ) + &op->oq_compare.rs_ava->aa_value, NULL, op->o_tmpmemctx ) == 0 ) { rs->sr_err = LDAP_COMPARE_TRUE; } return_results:; - ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex ); + ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock ); send_ldap_result( op, rs ); @@ -1407,12 +2012,20 @@ syncprov_op_mod( Operation *op, SlapRepl { slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; syncprov_info_t *si = on->on_bi.bi_private; + slap_callback *cb; + opcookie *opc; + int have_psearches, cbsize; + + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + have_psearches = ( si->si_ops != NULL ); + si->si_active++; + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); - slap_callback *cb = op->o_tmpcalloc(1, sizeof(slap_callback)+ - sizeof(opcookie) + - (si->si_ops ? sizeof(modinst) : 0 ), - op->o_tmpmemctx); - opcookie *opc = (opcookie *)(cb+1); + cbsize = sizeof(slap_callback) + sizeof(opcookie) + + (have_psearches ? sizeof(modinst) : 0 ); + + cb = op->o_tmpcalloc(1, cbsize, op->o_tmpmemctx); + opc = (opcookie *)(cb+1); opc->son = on; cb->sc_response = syncprov_op_response; cb->sc_cleanup = syncprov_op_cleanup; @@ -1420,10 +2033,22 @@ syncprov_op_mod( Operation *op, SlapRepl cb->sc_next = op->o_callback; op->o_callback = cb; + opc->osid = -1; + opc->rsid = -1; + if ( op->o_csn.bv_val ) { + opc->osid = slap_parse_csn_sid( &op->o_csn ); + } + if ( op->o_controls ) { + struct sync_cookie *scook = + op->o_controls[slap_cids.sc_LDAPsync]; + if ( scook ) + opc->rsid = scook->sid; + } + /* If there are active persistent searches, lock this operation. * See seqmod.c for the locking logic on its own. */ - if ( si->si_ops ) { + if ( have_psearches ) { modtarget *mt, mtdummy; modinst *mi; @@ -1436,14 +2061,44 @@ syncprov_op_mod( Operation *op, SlapRepl mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp ); if ( mt ) { ldap_pvt_thread_mutex_lock( &mt->mt_mutex ); + if ( mt->mt_mods == NULL ) { + /* Cannot reuse this mt, as another thread is about + * to release it in syncprov_op_cleanup. + */ + ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); + mt = NULL; + } + } + if ( mt ) { ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex ); mt->mt_tail->mi_next = mi; mt->mt_tail = mi; /* wait for this op to get to head of list */ while ( mt->mt_mods != mi ) { ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); - ldap_pvt_thread_yield(); + /* FIXME: if dynamic config can delete overlays or + * databases we'll have to check for cleanup here. + * Currently it's not an issue because there are + * no dynamic config deletes... + */ + if ( slapd_shutdown ) + return SLAPD_ABANDON; + + if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool )) + ldap_pvt_thread_yield(); ldap_pvt_thread_mutex_lock( &mt->mt_mutex ); + + /* clean up if the caller is giving up */ + if ( op->o_abandon ) { + modinst *m2; + for ( m2 = mt->mt_mods; m2->mi_next != mi; + m2 = m2->mi_next ); + m2->mi_next = mi->mi_next; + if ( mt->mt_tail == mi ) mt->mt_tail = m2; + op->o_tmpfree( cb, op->o_tmpmemctx ); + ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); + return SLAPD_ABANDON; + } } ldap_pvt_thread_mutex_unlock( &mt->mt_mutex ); } else { @@ -1456,11 +2111,11 @@ syncprov_op_mod( Operation *op, SlapRepl avl_insert( &si->si_mods, mt, sp_avl_cmp, avl_dup_error ); ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex ); } + opc->smt = mt; } - if (( si->si_ops || si->si_logs ) && op->o_tag != LDAP_REQ_ADD ) + if (( have_psearches || si->si_logs ) && op->o_tag != LDAP_REQ_ADD ) syncprov_matchops( op, opc, 1 ); - return SLAP_CB_CONTINUE; } @@ -1477,7 +2132,12 @@ syncprov_op_extended( Operation *op, Sla typedef struct searchstate { slap_overinst *ss_on; syncops *ss_so; - int ss_present; + BerVarray ss_ctxcsn; + int *ss_sids; + int ss_numcsns; +#define SS_PRESENT 0x01 +#define SS_CHANGED 0x02 + int ss_flags; } searchstate; static int @@ -1491,61 +2151,106 @@ syncprov_search_cleanup( Operation *op, return 0; } +typedef struct SyncOperationBuffer { + Operation sob_op; + Opheader sob_hdr; + OpExtra sob_oe; + AttributeName sob_extra; /* not always present */ + /* Further data allocated here */ +} SyncOperationBuffer; + static void -syncprov_detach_op( Operation *op, syncops *so ) +syncprov_detach_op( Operation *op, syncops *so, slap_overinst *on ) { + SyncOperationBuffer *sopbuf2; Operation *op2; int i, alen = 0; size_t size; char *ptr; + GroupAssertion *g1, *g2; /* count the search attrs */ for (i=0; op->ors_attrs && !BER_BVISNULL( &op->ors_attrs[i].an_name ); i++) { alen += op->ors_attrs[i].an_name.bv_len + 1; } /* Make a new copy of the operation */ - size = sizeof(Operation) + sizeof(Opheader) + + size = offsetof( SyncOperationBuffer, sob_extra ) + (i ? ( (i+1) * sizeof(AttributeName) + alen) : 0) + op->o_req_dn.bv_len + 1 + op->o_req_ndn.bv_len + 1 + op->o_ndn.bv_len + 1 + so->s_filterstr.bv_len + 1; - op2 = (Operation *)ch_malloc( size ); - *op2 = *op; - op2->o_hdr = (Opheader *)(op2+1); + sopbuf2 = ch_calloc( 1, size ); + op2 = &sopbuf2->sob_op; + op2->o_hdr = &sopbuf2->sob_hdr; + LDAP_SLIST_FIRST(&op2->o_extra) = &sopbuf2->sob_oe; + + /* Copy the fields we care about explicitly, leave the rest alone */ *op2->o_hdr = *op->o_hdr; + op2->o_tag = op->o_tag; + op2->o_time = op->o_time; + op2->o_bd = on->on_info->oi_origdb; + op2->o_request = op->o_request; + op2->o_managedsait = op->o_managedsait; + LDAP_SLIST_FIRST(&op2->o_extra)->oe_key = on; + LDAP_SLIST_NEXT(LDAP_SLIST_FIRST(&op2->o_extra), oe_next) = NULL; + + ptr = (char *) sopbuf2 + offsetof( SyncOperationBuffer, sob_extra ); if ( i ) { - op2->ors_attrs = (AttributeName *)(op2->o_hdr + 1); - ptr = (char *)(op2->ors_attrs+i+1); + op2->ors_attrs = (AttributeName *) ptr; + ptr = (char *) &op2->ors_attrs[i+1]; for (i=0; !BER_BVISNULL( &op->ors_attrs[i].an_name ); i++) { op2->ors_attrs[i] = op->ors_attrs[i]; op2->ors_attrs[i].an_name.bv_val = ptr; ptr = lutil_strcopy( ptr, op->ors_attrs[i].an_name.bv_val ) + 1; } BER_BVZERO( &op2->ors_attrs[i].an_name ); - } else { - ptr = (char *)(op2->o_hdr + 1); } + + op2->o_authz = op->o_authz; op2->o_ndn.bv_val = ptr; ptr = lutil_strcopy(ptr, op->o_ndn.bv_val) + 1; op2->o_dn = op2->o_ndn; + op2->o_req_dn.bv_len = op->o_req_dn.bv_len; op2->o_req_dn.bv_val = ptr; ptr = lutil_strcopy(ptr, op->o_req_dn.bv_val) + 1; + op2->o_req_ndn.bv_len = op->o_req_ndn.bv_len; op2->o_req_ndn.bv_val = ptr; ptr = lutil_strcopy(ptr, op->o_req_ndn.bv_val) + 1; 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->o_controls = NULL; - op2->o_callback = NULL; + + /* Skip the AND/GE clause that we stuck on in front */ + if ( so->s_flags & PS_FIX_FILTER ) { + op2->ors_filter = op->ors_filter->f_and->f_next; + so->s_flags ^= PS_FIX_FILTER; + } else { + op2->ors_filter = op->ors_filter; + } + op2->ors_filter = filter_dup( op2->ors_filter, NULL ); so->s_op = op2; - /* Increment number of ops so that idletimeout ignores us */ - ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); + /* Copy any cached group ACLs individually */ + op2->o_groups = NULL; + for ( g1=op->o_groups; g1; g1=g1->ga_next ) { + g2 = ch_malloc( sizeof(GroupAssertion) + g1->ga_len ); + *g2 = *g1; + strcpy( g2->ga_ndn, g1->ga_ndn ); + g2->ga_next = op2->o_groups; + op2->o_groups = g2; + } + /* Don't allow any further group caching */ + op2->o_do_not_cache = 1; + + /* Add op2 to conn so abandon will find us */ op->o_conn->c_n_ops_executing++; op->o_conn->c_n_ops_completed--; - ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next ); + so->s_flags |= PS_IS_DETACHED; + + /* Prevent anyone else from trying to send a result for this op */ + op->o_abandon = 1; } static int @@ -1553,100 +2258,136 @@ syncprov_search_response( Operation *op, { searchstate *ss = op->o_callback->sc_private; slap_overinst *on = ss->ss_on; - syncprov_info_t *si = on->on_bi.bi_private; + syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; sync_control *srs = op->o_controls[slap_cids.sc_LDAPsync]; if ( rs->sr_type == REP_SEARCH || rs->sr_type == REP_SEARCHREF ) { - int i; + Attribute *a; /* If we got a referral without a referral object, there's * something missing that we cannot replicate. Just ignore it. * The consumer will abort because we didn't send the expected * control. */ if ( !rs->sr_entry ) { - assert( rs->sr_entry ); + assert( rs->sr_entry != NULL ); Debug( LDAP_DEBUG_ANY, "bogus referral in context\n",0,0,0 ); return SLAP_CB_CONTINUE; } - if ( srs->sr_state.ctxcsn ) { - Attribute *a = attr_find( rs->sr_entry->e_attrs, - slap_schema.si_ad_entryCSN ); - /* Don't send the ctx entry twice */ - if ( bvmatch( &a->a_nvals[0], srs->sr_state.ctxcsn )) + 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 ) { + int i, sid; + sid = slap_parse_csn_sid( &a->a_nvals[0] ); + + /* Don't send changed entries back to the originator */ + if ( sid == srs->sr_state.sid && srs->sr_state.numcsns ) { + Debug( LDAP_DEBUG_SYNC, + "Entry %s changed by peer, ignored\n", + rs->sr_entry->e_name.bv_val, 0, 0 ); return LDAP_SUCCESS; + } + + /* If not a persistent search */ + if ( !ss->ss_so ) { + /* Make sure entry is less than the snapshot'd contextCSN */ + for ( i=0; iss_numcsns; i++ ) { + if ( sid == ss->ss_sids[i] && ber_bvcmp( &a->a_nvals[0], + &ss->ss_ctxcsn[i] ) > 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[i].bv_val ); + return LDAP_SUCCESS; + } + } + } + + /* Don't send old entries twice */ + if ( srs->sr_state.ctxcsn ) { + for ( i=0; isr_state.numcsns; i++ ) { + if ( sid == srs->sr_state.sids[i] && + ber_bvcmp( &a->a_nvals[0], + &srs->sr_state.ctxcsn[i] )<= 0 ) { + Debug( LDAP_DEBUG_SYNC, + "Entry %s CSN %s older or equal to ctx %s\n", + rs->sr_entry->e_name.bv_val, + a->a_nvals[0].bv_val, + srs->sr_state.ctxcsn[i].bv_val ); + return LDAP_SUCCESS; + } + } + } } rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2, op->o_tmpmemctx ); rs->sr_ctrls[1] = NULL; - rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry, - LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL ); + /* If we're in delta-sync mode, always send a cookie */ + if ( si->si_nopres && si->si_usehint && a ) { + struct berval cookie; + slap_compose_sync_cookie( op, &cookie, a->a_nvals, srs->sr_state.rid, slap_serverID ? slap_serverID : -1 ); + rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry, + LDAP_SYNC_ADD, rs->sr_ctrls, 0, 1, &cookie ); + } else { + rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry, + LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL ); + } } else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) { - struct berval cookie; + struct berval cookie = BER_BVNULL; + + if ( ( ss->ss_flags & SS_CHANGED ) && + ss->ss_ctxcsn && !BER_BVISNULL( &ss->ss_ctxcsn[0] )) { + slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn, + srs->sr_state.rid, slap_serverID ? slap_serverID : -1 ); - slap_compose_sync_cookie( op, &cookie, - &op->ors_filter->f_and->f_ava->aa_value, - srs->sr_state.sid, srs->sr_state.rid ); + Debug( LDAP_DEBUG_SYNC, "syncprov_search_response: cookie=%s\n", cookie.bv_val, 0, 0 ); + } - /* Is this a regular refresh? */ + /* Is this a regular refresh? + * Note: refresh never gets here if there were no changes + */ if ( !ss->ss_so ) { rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2, op->o_tmpmemctx ); rs->sr_ctrls[1] = NULL; rs->sr_err = syncprov_done_ctrl( op, rs, rs->sr_ctrls, - 0, 1, &cookie, ss->ss_present ? LDAP_SYNC_REFRESH_PRESENTS : + 0, 1, &cookie, ( ss->ss_flags & SS_PRESENT ) ? LDAP_SYNC_REFRESH_PRESENTS : LDAP_SYNC_REFRESH_DELETES ); + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); } else { - int locked = 0; /* It's RefreshAndPersist, transition to Persist phase */ - syncprov_sendinfo( op, rs, ss->ss_present ? + syncprov_sendinfo( op, rs, ( ss->ss_flags & SS_PRESENT ) ? LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE, - &cookie, 1, NULL, 0 ); - /* Flush any queued persist messages */ - if ( ss->ss_so->s_res ) { - syncres *sr, *srnext; - Entry *e; - opcookie opc; + ( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL, + 1, NULL, 0 ); + if ( !BER_BVISNULL( &cookie )) + op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx ); - opc.son = on; + /* Detach this Op from frontend control */ + ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); + + /* But not if this connection was closed along the way */ + if ( op->o_abandon ) { + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + /* syncprov_ab_cleanup will free this syncop */ + return SLAPD_ABANDON; + + } else { ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); - locked = 1; - for (sr = ss->ss_so->s_res; sr; sr=srnext) { - int rc = LDAP_SUCCESS; - srnext = sr->s_next; - opc.sdn = sr->s_dn; - opc.sndn = sr->s_ndn; - opc.suuid = sr->s_uuid; - opc.sctxcsn = sr->s_csn; - opc.sreference = sr->s_isreference; - e = NULL; - - if ( sr->s_mode != LDAP_SYNC_DELETE ) { - op->o_bd->bd_info = (BackendInfo *)on->on_info; - rc = be_entry_get_rw( op, &opc.sndn, NULL, NULL, 0, &e ); - op->o_bd->bd_info = (BackendInfo *)on; - } - if ( rc == LDAP_SUCCESS ) - syncprov_sendresp( op, &opc, ss->ss_so, e, - sr->s_mode, 0 ); - - if ( e ) { - op->o_bd->bd_info = (BackendInfo *)on->on_info; - be_entry_release_r( op, e ); - op->o_bd->bd_info = (BackendInfo *)on; - } - ch_free( sr ); - } - ss->ss_so->s_res = NULL; - ss->ss_so->s_restail = NULL; - } + /* Turn off the refreshing flag */ + ss->ss_so->s_flags ^= PS_IS_REFRESHING; - /* Turn off the refreshing flag */ - ss->ss_so->s_flags ^= PS_IS_REFRESHING; - if ( locked ) - ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); + syncprov_detach_op( op, ss->ss_so, on ); - /* Detach this Op from frontend control */ - syncprov_detach_op( op, ss->ss_so ); + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + + /* If there are queued responses, fire them off */ + if ( ss->ss_so->s_res ) + syncprov_qstart( ss->ss_so ); + ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); + } return LDAP_SUCCESS; } @@ -1661,13 +2402,14 @@ syncprov_op_search( Operation *op, SlapR slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; slap_callback *cb; - int gotstate = 0, nochange = 0, do_present = 1; - Filter *fand, *fava; + int gotstate = 0, changed = 0, do_present = 0; syncops *sop = NULL; searchstate *ss; sync_control *srs; - struct berval ctxcsn; - char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; + BerVarray ctxcsn; + int i, *sids, numcsns; + struct berval mincsn; + int dirty = 0; if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE; @@ -1689,14 +2431,16 @@ syncprov_op_search( Operation *op, SlapR fc.fbase = 0; so.s_eid = NOID; so.s_op = op; - so.s_flags = PS_IS_REFRESHING; + so.s_flags = PS_IS_REFRESHING | PS_FIND_BASE; /* 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 ); @@ -1705,58 +2449,154 @@ syncprov_op_search( Operation *op, SlapR sop = ch_malloc( sizeof( syncops )); *sop = so; ldap_pvt_thread_mutex_init( &sop->s_mutex ); - ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); - sop->s_sid = srs->sr_state.sid; sop->s_rid = srs->sr_state.rid; - sop->s_next = si->si_ops; + sop->s_sid = srs->sr_state.sid; sop->s_inuse = 1; + + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + while ( si->si_active ) { + /* Wait for active mods to finish before proceeding, as they + * may already have inspected the si_ops list looking for + * consumers to replicate the change to. Using the log + * doesn't help, as we may finish playing it before the + * active mods gets added to it. + */ + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); + if ( slapd_shutdown ) + return SLAPD_ABANDON; + if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool )) + ldap_pvt_thread_yield(); + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + } + sop->s_next = si->si_ops; si->si_ops = sop; ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); } /* snapshot the ctxcsn */ - ldap_pvt_thread_mutex_lock( &si->si_csn_mutex ); - strcpy( csnbuf, si->si_ctxcsnbuf ); - ctxcsn.bv_len = si->si_ctxcsn.bv_len; - ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex ); - ctxcsn.bv_val = csnbuf; + ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock ); + numcsns = si->si_numcsns; + if ( numcsns ) { + ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx ); + sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx ); + for ( i=0; isi_sids[i]; + } else { + ctxcsn = NULL; + sids = NULL; + } + dirty = si->si_dirty; + ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock ); /* If we have a cookie, handle the PRESENT lookups */ if ( srs->sr_state.ctxcsn ) { sessionlog *sl; + int i, j; - /* Is the CSN in a valid format? */ - if ( srs->sr_state.ctxcsn->bv_len >= LDAP_LUTIL_CSNSTR_BUFSIZE ) { - send_ldap_error( op, rs, LDAP_OTHER, "invalid sync cookie" ); - return rs->sr_err; + /* If we don't have any CSN of our own yet, pretend nothing + * has changed. + */ + if ( !numcsns ) + goto no_change; + + if ( !si->si_nopres ) + do_present = SS_PRESENT; + + /* If there are SIDs we don't recognize in the cookie, drop them */ + for (i=0; isr_state.numcsns; ) { + for (j=0; jsr_state.sids[i] == sids[j] ) { + break; + } + } + /* not found */ + if ( j == numcsns ) { + struct berval tmp = srs->sr_state.ctxcsn[i]; + j = srs->sr_state.numcsns - 1; + srs->sr_state.ctxcsn[i] = srs->sr_state.ctxcsn[j]; + tmp.bv_len = 0; + srs->sr_state.ctxcsn[j] = tmp; + srs->sr_state.numcsns = j; + srs->sr_state.sids[i] = srs->sr_state.sids[j]; + continue; + } + i++; } - /* If just Refreshing and nothing has changed, shortcut it */ - if ( bvmatch( srs->sr_state.ctxcsn, &ctxcsn )) { - nochange = 1; - if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) { - LDAPControl *ctrls[2]; - - ctrls[0] = NULL; - ctrls[1] = NULL; - syncprov_done_ctrl( op, rs, ctrls, 0, 0, - NULL, LDAP_SYNC_REFRESH_DELETES ); - rs->sr_ctrls = ctrls; - rs->sr_err = LDAP_SUCCESS; - send_ldap_result( op, rs ); - rs->sr_ctrls = NULL; - return rs->sr_err; + + /* Find the smallest CSN */ + mincsn = srs->sr_state.ctxcsn[0]; + for ( i=1; isr_state.numcsns; i++ ) { + if ( ber_bvcmp( &mincsn, &srs->sr_state.ctxcsn[i] ) > 0 ) + mincsn = srs->sr_state.ctxcsn[i]; + } + + /* If nothing has changed, shortcut it */ + if ( srs->sr_state.numcsns == numcsns ) { + int i, j, newer; + for ( i=0; isr_state.numcsns; i++ ) { + for ( j=0; jsr_state.sids[i] != sids[j] ) + continue; + newer = ber_bvcmp( &srs->sr_state.ctxcsn[i], &ctxcsn[j] ); + /* If our state is newer, tell consumer about changes */ + if ( newer < 0 ) + changed = SS_CHANGED; + else if ( newer > 0 ) { + /* our state is older, complain to consumer */ + rs->sr_err = LDAP_UNWILLING_TO_PERFORM; + rs->sr_text = "consumer state is newer than provider!"; +bailout: + if ( sop ) { + syncops **sp = &si->si_ops; + + ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); + while ( *sp != sop ) + sp = &(*sp)->s_next; + *sp = sop->s_next; + ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); + ch_free( sop ); + } + rs->sr_ctrls = NULL; + send_ldap_result( op, rs ); + return rs->sr_err; + } + break; + } + if ( changed ) + break; } - goto shortcut; + if ( !changed && !dirty ) { + do_present = 0; +no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) { + LDAPControl *ctrls[2]; + + ctrls[0] = NULL; + ctrls[1] = NULL; + syncprov_done_ctrl( op, rs, ctrls, 0, 0, + NULL, LDAP_SYNC_REFRESH_DELETES ); + rs->sr_ctrls = ctrls; + rs->sr_err = LDAP_SUCCESS; + send_ldap_result( op, rs ); + rs->sr_ctrls = NULL; + return rs->sr_err; + } + goto shortcut; + } + } else { + /* consumer doesn't have the right number of CSNs */ + changed = SS_CHANGED; } /* Do we have a sessionlog for this search? */ - for ( sl=si->si_logs; sl; sl=sl->sl_next ) - if ( sl->sl_sid == srs->sr_state.sid ) break; + sl=si->si_logs; if ( sl ) { ldap_pvt_thread_mutex_lock( &sl->sl_mutex ); - if ( ber_bvcmp( srs->sr_state.ctxcsn, &sl->sl_mincsn ) >= 0 ) { + /* Are there any log entries, and is the consumer state + * present in the session log? + */ + if ( sl->sl_num > 0 && ber_bvcmp( &mincsn, &sl->sl_head->se_csn ) >= 0 ) { do_present = 0; /* mutex is unlocked in playlog */ - syncprov_playlog( op, rs, sl, srs->sr_state.ctxcsn, &ctxcsn ); + syncprov_playlog( op, rs, sl, srs, ctxcsn, numcsns, sids ); } else { ldap_pvt_thread_mutex_unlock( &sl->sl_mutex ); } @@ -1764,23 +2604,43 @@ syncprov_op_search( Operation *op, SlapR /* Is the CSN still present in the database? */ if ( syncprov_findcsn( op, FIND_CSN ) != LDAP_SUCCESS ) { /* No, so a reload is required */ -#if 0 /* the consumer doesn't seem to send this hint */ - if ( op->o_sync_rhint == 0 ) { - send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" ); - return rs->sr_err; + /* the 2.2 consumer doesn't send this hint */ + if ( si->si_usehint && srs->sr_rhint == 0 ) { + if ( ctxcsn ) + ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx ); + if ( sids ) + op->o_tmpfree( sids, op->o_tmpmemctx ); + rs->sr_err = LDAP_SYNC_REFRESH_REQUIRED; + rs->sr_text = "sync cookie is stale"; + goto bailout; + } + if ( srs->sr_state.ctxcsn ) { + ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx ); + srs->sr_state.ctxcsn = NULL; + } + if ( srs->sr_state.sids ) { + slap_sl_free( srs->sr_state.sids, op->o_tmpmemctx ); + srs->sr_state.sids = NULL; } -#endif + srs->sr_state.numcsns = 0; } else { gotstate = 1; /* If changed and doing Present lookup, send Present UUIDs */ if ( do_present && syncprov_findcsn( op, FIND_PRESENT ) != LDAP_SUCCESS ) { - send_ldap_result( op, rs ); - return rs->sr_err; + if ( ctxcsn ) + ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx ); + if ( sids ) + op->o_tmpfree( sids, op->o_tmpmemctx ); + goto bailout; } } + } else { + /* No consumer state, assume something has changed */ + changed = SS_CHANGED; } +shortcut: /* Append CSN range to search filter, save original filter * for persistent search evaluation */ @@ -1788,49 +2648,53 @@ syncprov_op_search( Operation *op, SlapR sop->s_filterstr= op->ors_filterstr; } - fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx ); - fand->f_choice = LDAP_FILTER_AND; - fand->f_next = NULL; - fava = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx ); - fava->f_choice = LDAP_FILTER_LE; - fava->f_ava = op->o_tmpalloc( sizeof(AttributeAssertion), op->o_tmpmemctx ); - fava->f_ava->aa_desc = slap_schema.si_ad_entryCSN; - ber_dupbv_x( &fava->f_ava->aa_value, &ctxcsn, op->o_tmpmemctx ); - fand->f_and = fava; - if ( gotstate ) { - fava->f_next = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx ); - fava = fava->f_next; + /* If something changed, find the changes */ + if ( gotstate && ( changed || dirty ) ) { + Filter *fand, *fava; + + fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx ); + fand->f_choice = LDAP_FILTER_AND; + fand->f_next = NULL; + fava = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx ); + fand->f_and = fava; fava->f_choice = LDAP_FILTER_GE; fava->f_ava = op->o_tmpalloc( sizeof(AttributeAssertion), op->o_tmpmemctx ); fava->f_ava->aa_desc = slap_schema.si_ad_entryCSN; - ber_dupbv_x( &fava->f_ava->aa_value, srs->sr_state.ctxcsn, op->o_tmpmemctx ); +#ifdef LDAP_COMP_MATCH + fava->f_ava->aa_cf = NULL; +#endif + ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx ); + fava->f_next = op->ors_filter; + if ( sop ) + ldap_pvt_thread_mutex_lock( &sop->s_mutex ); + op->ors_filter = fand; + filter2bv_x( op, op->ors_filter, &op->ors_filterstr ); + if ( sop ) { + sop->s_flags |= PS_FIX_FILTER; + ldap_pvt_thread_mutex_unlock( &sop->s_mutex ); + } } - fava->f_next = op->ors_filter; - op->ors_filter = fand; - filter2bv_x( op, op->ors_filter, &op->ors_filterstr ); -shortcut: /* Let our callback add needed info to returned entries */ cb = op->o_tmpcalloc(1, sizeof(slap_callback)+sizeof(searchstate), op->o_tmpmemctx); ss = (searchstate *)(cb+1); ss->ss_on = on; ss->ss_so = sop; - ss->ss_present = do_present; + ss->ss_flags = do_present | changed; + ss->ss_ctxcsn = ctxcsn; + ss->ss_numcsns = numcsns; + ss->ss_sids = sids; cb->sc_response = syncprov_search_response; cb->sc_cleanup = syncprov_search_cleanup; cb->sc_private = ss; cb->sc_next = op->o_callback; op->o_callback = cb; -#if 0 /* I don't think we need to shortcircuit back-bdb any more */ - op->o_sync_mode &= SLAP_CONTROL_MASK; -#endif - /* If this is a persistent search and no changes were reported during * the refresh phase, just invoke the response callback to transition * us into persist phase */ - if ( nochange ) { + if ( !changed && !dirty ) { rs->sr_err = LDAP_SUCCESS; rs->sr_nentries = 0; send_ldap_result( op, rs ); @@ -1847,8 +2711,14 @@ syncprov_operational( slap_overinst *on = (slap_overinst *)op->o_bd->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; + /* This prevents generating unnecessarily; frontend will strip + * any statically stored copy. + */ + if ( op->o_sync != SLAP_CONTROL_NONE ) + return SLAP_CB_CONTINUE; + if ( rs->sr_entry && - dn_match( &rs->sr_entry->e_nname, op->o_bd->be_nsuffix )) { + dn_match( &rs->sr_entry->e_nname, &si->si_contextdn )) { if ( SLAP_OPATTRS( rs->sr_attr_flags ) || ad_inlist( slap_schema.si_ad_contextCSN, rs->sr_attrs )) { @@ -1859,111 +2729,242 @@ syncprov_operational( break; } - if ( !a ) { - for ( ap = &rs->sr_operational_attrs; *ap; ap=&(*ap)->a_next ); + ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock ); + if ( si->si_ctxcsn ) { + if ( !a ) { + for ( ap = &rs->sr_operational_attrs; *ap; + ap=&(*ap)->a_next ); - a = ch_malloc( sizeof(Attribute)); - a->a_desc = slap_schema.si_ad_contextCSN; - a->a_vals = ch_malloc( 2 * sizeof(struct berval)); - a->a_vals[1].bv_val = NULL; - a->a_nvals = a->a_vals; - a->a_next = NULL; - a->a_flags = 0; - *ap = a; - } - - ldap_pvt_thread_mutex_lock( &si->si_csn_mutex ); - if ( !ap ) { - strcpy( a->a_vals[0].bv_val, si->si_ctxcsnbuf ); - } else { - ber_dupbv( &a->a_vals[0], &si->si_ctxcsn ); + a = attr_alloc( slap_schema.si_ad_contextCSN ); + *ap = a; + } + + if ( !ap ) { + if ( !(rs->sr_flags & REP_ENTRY_MODIFIABLE) ) { + Entry *e = entry_dup( rs->sr_entry ); + if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) { + overlay_entry_release_ov( op, rs->sr_entry, 0, on ); + rs->sr_flags ^= REP_ENTRY_MUSTRELEASE; + } else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) { + entry_free( rs->sr_entry ); + } + rs->sr_entry = e; + rs->sr_flags |= + REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED; + a = attr_find( rs->sr_entry->e_attrs, + slap_schema.si_ad_contextCSN ); + } + if ( a->a_nvals != a->a_vals ) { + ber_bvarray_free( a->a_nvals ); + } + a->a_nvals = NULL; + ber_bvarray_free( a->a_vals ); + a->a_vals = NULL; + a->a_numvals = 0; + } + attr_valadd( a, si->si_ctxcsn, si->si_ctxcsn, si->si_numcsns ); } - ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex ); + ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock ); } } return SLAP_CB_CONTINUE; } +enum { + SP_CHKPT = 1, + SP_SESSL, + SP_NOPRES, + SP_USEHINT +}; + +static ConfigDriver sp_cf_gen; + +static ConfigTable spcfg[] = { + { "syncprov-checkpoint", "ops> bd_info; + slap_overinst *on = (slap_overinst *)c->bi; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; + int rc = 0; - if ( strcasecmp( argv[ 0 ], "syncprov-checkpoint" ) == 0 ) { - if ( argc != 3 ) { - fprintf( stderr, "%s: line %d: wrong number of arguments in " - "\"syncprov-checkpoint \"\n", fname, lineno ); - return -1; + if ( c->op == SLAP_CONFIG_EMIT ) { + switch ( c->type ) { + case SP_CHKPT: + if ( si->si_chkops || si->si_chktime ) { + struct berval bv; + /* we assume si_chktime is a multiple of 60 + * because the parsed value was originally + * multiplied by 60 */ + bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ), + "%d %d", si->si_chkops, si->si_chktime/60 ); + if ( bv.bv_len >= sizeof( c->cr_msg ) ) { + rc = 1; + } else { + bv.bv_val = c->cr_msg; + value_add_one( &c->rvalue_vals, &bv ); + } + } else { + rc = 1; + } + break; + case SP_SESSL: + if ( si->si_logs ) { + c->value_int = si->si_logs->sl_size; + } else { + rc = 1; + } + break; + case SP_NOPRES: + if ( si->si_nopres ) { + c->value_int = 1; + } else { + rc = 1; + } + break; + case SP_USEHINT: + if ( si->si_usehint ) { + c->value_int = 1; + } else { + rc = 1; + } + break; } - si->si_chkops = atoi( argv[1] ); - si->si_chktime = atoi( argv[2] ) * 60; - return 0; - - } else if ( strcasecmp( argv[0], "syncprov-sessionlog" ) == 0 ) { - sessionlog *sl; - int sid, size; - if ( argc != 3 ) { - fprintf( stderr, "%s: line %d: wrong number of arguments in " - "\"syncprov-sessionlog \"\n", fname, lineno ); - return -1; - } - sid = atoi( argv[1] ); - if ( sid < 0 || sid > 999 ) { - fprintf( stderr, - "%s: line %d: session log id %d is out of range [0..999]\n", - fname, lineno, sid ); - return -1; + return rc; + } else if ( c->op == LDAP_MOD_DELETE ) { + switch ( c->type ) { + case SP_CHKPT: + si->si_chkops = 0; + si->si_chktime = 0; + break; + case SP_SESSL: + if ( si->si_logs ) + si->si_logs->sl_size = 0; + else + rc = LDAP_NO_SUCH_ATTRIBUTE; + break; + case SP_NOPRES: + if ( si->si_nopres ) + si->si_nopres = 0; + 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; } - size = atoi( argv[2] ); + return rc; + } + switch ( c->type ) { + case SP_CHKPT: + if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s unable to parse checkpoint ops # \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, + "%s: %s\n", c->log, c->cr_msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chkops <= 0 ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s invalid checkpoint ops # \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, + "%s: %s\n", c->log, c->cr_msg, 0 ); + return ARG_BAD_CONF; + } + if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s unable to parse checkpoint time \"%s\"", + c->argv[0], c->argv[1] ); + Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, + "%s: %s\n", c->log, c->cr_msg, 0 ); + return ARG_BAD_CONF; + } + if ( si->si_chktime <= 0 ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s invalid checkpoint time \"%d\"", + c->argv[0], si->si_chkops ); + Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, + "%s: %s\n", c->log, c->cr_msg, 0 ); + return ARG_BAD_CONF; + } + si->si_chktime *= 60; + break; + case SP_SESSL: { + sessionlog *sl; + int size = c->value_int; + if ( size < 0 ) { - fprintf( stderr, - "%s: line %d: session log size %d is negative\n", - fname, lineno, size ); - return -1; - } - for ( sl = si->si_logs; sl; sl=sl->sl_next ) { - if ( sl->sl_sid == sid ) { - sl->sl_size = size; - break; - } + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s size %d is negative", + c->argv[0], size ); + Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, + "%s: %s\n", c->log, c->cr_msg, 0 ); + return ARG_BAD_CONF; } + sl = si->si_logs; if ( !sl ) { - sl = ch_malloc( sizeof( sessionlog ) + LDAP_LUTIL_CSNSTR_BUFSIZE ); - sl->sl_mincsn.bv_val = (char *)(sl+1); - sl->sl_mincsn.bv_len = 0; - sl->sl_sid = sid; - sl->sl_size = size; + sl = ch_malloc( sizeof( sessionlog ) ); sl->sl_num = 0; sl->sl_head = sl->sl_tail = NULL; - sl->sl_next = si->si_logs; ldap_pvt_thread_mutex_init( &sl->sl_mutex ); si->si_logs = sl; } - return 0; + sl->sl_size = size; + } + break; + case SP_NOPRES: + si->si_nopres = c->value_int; + break; + case SP_USEHINT: + si->si_usehint = c->value_int; + break; } - - return SLAP_CONF_UNKNOWN; + return rc; } -/* Cheating - we have no thread pool context for these functions, - * so make one. +/* ITS#3456 we cannot run this search on the main thread, must use a + * child thread in order to insure we have a big enough stack. */ -typedef struct thread_keys { - void *key; - void *data; - ldap_pvt_thread_pool_keyfree_t *xfree; -} thread_keys; - -#define MAXKEYS 32 -/* A fake thread context */ -static thread_keys thrctx[MAXKEYS]; +static void * +syncprov_db_otask( + void *ptr +) +{ + syncprov_findcsn( ptr, FIND_MAXCSN ); + return NULL; +} /* Read any existing contextCSN from the underlying db. * Then search for any entries newer than that. If no value exists, @@ -1971,63 +2972,96 @@ static thread_keys thrctx[MAXKEYS]; */ static int syncprov_db_open( - BackendDB *be + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *) be->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; - Connection conn; - char opbuf[OPERATION_BUFFER_SIZE]; - char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; - Operation *op = (Operation *)opbuf; - Entry *e; + Connection conn = { 0 }; + OperationBuffer opbuf; + Operation *op; + Entry *e = NULL; Attribute *a; int rc; + void *thrctx = NULL; + + if ( !SLAP_LASTMOD( be )) { + Debug( LDAP_DEBUG_ANY, + "syncprov_db_open: invalid config, lastmod must be enabled\n", 0, 0, 0 ); + return -1; + } + + if ( slapMode & SLAP_TOOL_MODE ) { + return 0; + } - connection_fake_init( &conn, op, thrctx ); + rc = overlay_register_control( be, LDAP_CONTROL_SYNC ); + if ( rc ) { + return rc; + } + + thrctx = ldap_pvt_thread_pool_context(); + connection_fake_init2( &conn, &opbuf, thrctx, 0 ); + op = &opbuf.ob_op; op->o_bd = be; op->o_dn = be->be_rootdn; op->o_ndn = be->be_rootndn; - ctxcsnbuf[0] = '\0'; - - op->o_bd->bd_info = on->on_info->oi_orig; - rc = be_entry_get_rw( op, be->be_nsuffix, NULL, - slap_schema.si_ad_contextCSN, 0, &e ); + if ( SLAP_SYNC_SUBENTRY( be )) { + build_new_dn( &si->si_contextdn, be->be_nsuffix, + (struct berval *)&slap_ldapsync_cn_bv, NULL ); + } else { + si->si_contextdn = be->be_nsuffix[0]; + } + rc = overlay_entry_get_ov( op, &si->si_contextdn, NULL, + slap_schema.si_ad_contextCSN, 0, &e, on ); if ( e ) { + ldap_pvt_thread_t tid; + a = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN ); if ( a ) { - si->si_ctxcsn.bv_len = a->a_nvals[0].bv_len; - if ( si->si_ctxcsn.bv_len >= sizeof(si->si_ctxcsnbuf )) - si->si_ctxcsn.bv_len = sizeof(si->si_ctxcsnbuf)-1; - strncpy( si->si_ctxcsnbuf, a->a_nvals[0].bv_val, - si->si_ctxcsn.bv_len ); - si->si_ctxcsnbuf[si->si_ctxcsn.bv_len] = '\0'; - strcpy( ctxcsnbuf, si->si_ctxcsnbuf ); - } - be_entry_release_r( op, e ); - 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; - syncprov_findcsn( op, FIND_MAXCSN ); - } - - if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) { - slap_get_csn( op, si->si_ctxcsnbuf, sizeof(si->si_ctxcsnbuf), - &si->si_ctxcsn, 0 ); + ber_bvarray_dup_x( &si->si_ctxcsn, a->a_vals, NULL ); + si->si_numcsns = a->a_numvals; + si->si_sids = slap_parse_csn_sids( si->si_ctxcsn, a->a_numvals, NULL ); + } + overlay_entry_release_ov( op, e, 0, on ); + if ( si->si_ctxcsn && !SLAP_DBCLEAN( be )) { + 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 our ctxcsn is different from what was read from the root - * entry, write the new value out. - */ - if ( strcmp( si->si_ctxcsnbuf, ctxcsnbuf )) { - SlapReply rs = {REP_RESULT}; - syncprov_checkpoint( op, &rs, on ); + /* Didn't find a contextCSN, should we generate one? */ + if ( !si->si_ctxcsn ) { + char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ]; + struct berval csn; + + if ( SLAP_SYNC_SHADOW( op->o_bd )) { + /* If we're also a consumer, then don't generate anything. + * Wait for our provider to send it to us, or for a local + * modify if we have multimaster. + */ + goto out; + } + csn.bv_val = csnbuf; + csn.bv_len = sizeof( csnbuf ); + slap_get_csn( op, &csn, 0 ); + value_add_one( &si->si_ctxcsn, &csn ); + si->si_numcsns = 1; + si->si_sids = ch_malloc( sizeof(int) ); + si->si_sids[0] = slap_serverID; + + /* make sure we do a checkpoint on close */ + si->si_numops++; } +out: op->o_bd->bd_info = (BackendInfo *)on; return 0; } @@ -2036,51 +3070,62 @@ syncprov_db_open( */ static int syncprov_db_close( - BackendDB *be + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *) be->bd_info; syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private; - int i; + if ( slapMode & SLAP_TOOL_MODE ) { + return 0; + } if ( si->si_numops ) { - Connection conn; - char opbuf[OPERATION_BUFFER_SIZE]; - Operation *op = (Operation *)opbuf; + Connection conn = {0}; + OperationBuffer opbuf; + Operation *op; SlapReply rs = {REP_RESULT}; + void *thrctx; - connection_fake_init( &conn, op, thrctx ); + thrctx = ldap_pvt_thread_pool_context(); + connection_fake_init2( &conn, &opbuf, thrctx, 0 ); + op = &opbuf.ob_op; op->o_bd = be; op->o_dn = be->be_rootdn; op->o_ndn = be->be_rootndn; syncprov_checkpoint( op, &rs, on ); } - for ( i=0; thrctx[i].key; i++) { - if ( thrctx[i].xfree ) - thrctx[i].xfree( thrctx[i].key, thrctx[i].data ); - thrctx[i].key = NULL; - } return 0; } static int syncprov_db_init( - BackendDB *be + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *)be->bd_info; syncprov_info_t *si; + if ( SLAP_ISGLOBALOVERLAY( be ) ) { + Debug( LDAP_DEBUG_ANY, + "syncprov must be instantiated within a database.\n", + 0, 0, 0 ); + return 1; + } + si = ch_calloc(1, sizeof(syncprov_info_t)); on->on_bi.bi_private = si; - ldap_pvt_thread_mutex_init( &si->si_csn_mutex ); + ldap_pvt_thread_rdwr_init( &si->si_csn_rwlock ); ldap_pvt_thread_mutex_init( &si->si_ops_mutex ); ldap_pvt_thread_mutex_init( &si->si_mods_mutex ); - si->si_ctxcsn.bv_val = si->si_ctxcsnbuf; + ldap_pvt_thread_mutex_init( &si->si_resp_mutex ); csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN; csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname; + csn_anlist[1].an_desc = slap_schema.si_ad_entryUUID; + csn_anlist[1].an_name = slap_schema.si_ad_entryUUID->ad_cname; uuid_anlist[0].an_desc = slap_schema.si_ad_entryUUID; uuid_anlist[0].an_name = slap_schema.si_ad_entryUUID->ad_cname; @@ -2090,16 +3135,33 @@ syncprov_db_init( static int syncprov_db_destroy( - BackendDB *be + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *)be->bd_info; 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 ); + } + if ( si->si_ctxcsn ) + ber_bvarray_free( si->si_ctxcsn ); + if ( si->si_sids ) + ch_free( si->si_sids ); + ldap_pvt_thread_mutex_destroy( &si->si_resp_mutex ); 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 ); + ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock ); ch_free( si ); } @@ -2112,7 +3174,8 @@ static int syncprov_parseCtrl ( LDAPControl *ctrl ) { ber_tag_t tag; - BerElement *ber; + BerElementBuffer berbuf; + BerElement *ber = (BerElement *)&berbuf; ber_int_t mode; ber_len_t len; struct berval cookie = BER_BVNULL; @@ -2129,8 +3192,13 @@ static int syncprov_parseCtrl ( return LDAP_PROTOCOL_ERROR; } + if ( BER_BVISNULL( &ctrl->ldctl_value ) ) { + rs->sr_text = "Sync control value is absent"; + return LDAP_PROTOCOL_ERROR; + } + if ( BER_BVISEMPTY( &ctrl->ldctl_value ) ) { - rs->sr_text = "Sync control value is empty (or absent)"; + rs->sr_text = "Sync control value is empty"; return LDAP_PROTOCOL_ERROR; } @@ -2146,11 +3214,7 @@ static int syncprov_parseCtrl ( * } */ - ber = ber_init( &ctrl->ldctl_value ); - if( ber == NULL ) { - rs->sr_text = "internal error"; - return LDAP_OTHER; - } + ber_init2( ber, &ctrl->ldctl_value, 0 ); if ( (tag = ber_scanf( ber, "{i" /*}*/, &mode )) == LBER_ERROR ) { rs->sr_text = "Sync control : mode decoding error"; @@ -2172,10 +3236,11 @@ static int syncprov_parseCtrl ( tag = ber_peek_tag( ber, &len ); if ( tag == LDAP_TAG_SYNC_COOKIE ) { - if (( ber_scanf( ber, /*{*/ "o", &cookie )) == LBER_ERROR ) { + if (( ber_scanf( ber, /*{*/ "m", &cookie )) == LBER_ERROR ) { 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 ) { @@ -2190,14 +3255,20 @@ static int syncprov_parseCtrl ( sr = op->o_tmpcalloc( 1, sizeof(struct sync_control), op->o_tmpmemctx ); sr->sr_rhint = rhint; if (!BER_BVISNULL(&cookie)) { - ber_bvarray_add( &sr->sr_state.octet_str, &cookie ); - slap_parse_sync_cookie( &sr->sr_state ); + ber_dupbv_x( &sr->sr_state.octet_str, &cookie, op->o_tmpmemctx ); + /* If parse fails, pretend no cookie was sent */ + if ( slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx ) || + sr->sr_state.rid == -1 ) { + if ( sr->sr_state.ctxcsn ) { + ber_bvarray_free_x( sr->sr_state.ctxcsn, op->o_tmpmemctx ); + sr->sr_state.ctxcsn = NULL; + } + sr->sr_state.numcsns = 0; + } } op->o_controls[slap_cids.sc_LDAPsync] = sr; - (void) ber_free( ber, 1 ); - op->o_sync = ctrl->ldctl_iscritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; @@ -2215,21 +3286,21 @@ 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 ) { - fprintf( stderr, "Failed to register control %d\n", rc ); + Debug( LDAP_DEBUG_ANY, + "syncprov_init: Failed to register control %d\n", rc, 0, 0 ); return rc; } syncprov.on_bi.bi_type = "syncprov"; syncprov.on_bi.bi_db_init = syncprov_db_init; - syncprov.on_bi.bi_db_config = syncprov_db_config; syncprov.on_bi.bi_db_destroy = syncprov_db_destroy; syncprov.on_bi.bi_db_open = syncprov_db_open; syncprov.on_bi.bi_db_close = syncprov_db_close; @@ -2246,6 +3317,13 @@ syncprov_init() syncprov.on_bi.bi_extended = syncprov_op_extended; syncprov.on_bi.bi_operational = syncprov_operational; + 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; + return overlay_register( &syncprov ); } @@ -2253,7 +3331,7 @@ syncprov_init() int init_module( int argc, char *argv[] ) { - return syncprov_init(); + return syncprov_initialize(); } #endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */