servers/slapd/overlays/syncprov.c - diff

Return to syncprov.c CVS log

Up to [OpenLDAP] / servers / slapd / overlays

Diff for /servers/slapd/overlays/syncprov.c between versions 1.147.2.54 and 1.147.2.76

version 1.147.2.54, 2009/03/17 16:29:38	version 1.147.2.76, 2010/12/12 00:47:22
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.53 2009/03/17 16:26:43 quanah Exp $ */	/* $OpenLDAP$ */
/* syncprov.c - syncrepl provider */	/* syncprov.c - syncrepl provider */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 2004-2009 The OpenLDAP Foundation.	* Copyright 2004-2010 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 48 typedef struct modtarget {	Line 48 typedef struct modtarget {
/* A queued result of a persistent search */	/* A queued result of a persistent search */
typedef struct syncres {	typedef struct syncres {
struct syncres *s_next;	struct syncres *s_next;
	Entry *s_e;
struct berval s_dn;	struct berval s_dn;
struct berval s_ndn;	struct berval s_ndn;
struct berval s_uuid;	struct berval s_uuid;
Line 124 typedef struct sessionlog {	Line 125 typedef struct sessionlog {
typedef struct syncprov_info_t {	typedef struct syncprov_info_t {
syncops *si_ops;	syncops *si_ops;
BerVarray si_ctxcsn; /* ldapsync context */	BerVarray si_ctxcsn; /* ldapsync context */
	struct berval si_contextdn;
int *si_sids;	int *si_sids;
int si_numcsns;	int si_numcsns;
int si_chkops; /* checkpointing info */	int si_chkops; /* checkpointing info */
Line 137 typedef struct syncprov_info_t {	Line 139 typedef struct syncprov_info_t {
ldap_pvt_thread_rdwr_t si_csn_rwlock;	ldap_pvt_thread_rdwr_t si_csn_rwlock;
ldap_pvt_thread_mutex_t si_ops_mutex;	ldap_pvt_thread_mutex_t si_ops_mutex;
ldap_pvt_thread_mutex_t si_mods_mutex;	ldap_pvt_thread_mutex_t si_mods_mutex;
	ldap_pvt_thread_mutex_t si_resp_mutex;
} syncprov_info_t;	} syncprov_info_t;

typedef struct opcookie {	typedef struct opcookie {
slap_overinst *son;	slap_overinst *son;
syncmatches *smatches;	syncmatches *smatches;
modtarget *smt;	modtarget *smt;
	Entry *se;
struct berval sdn; /* DN of entry, for deletes */	struct berval sdn; /* DN of entry, for deletes */
struct berval sndn;	struct berval sndn;
struct berval suuid; /* UUID of entry */	struct berval suuid; /* UUID of entry */
Line 152 typedef struct opcookie {	Line 156 typedef struct opcookie {
short sreference; /* Is the entry a reference? */	short sreference; /* Is the entry a reference? */
} opcookie;	} opcookie;

	typedef struct mutexint {
	ldap_pvt_thread_mutex_t mi_mutex;
	int mi_int;
	} mutexint;

typedef struct fbase_cookie {	typedef struct fbase_cookie {
struct berval fdn; / DN of a modified entry, for scope testing */	struct berval fdn; / DN of a modified entry, for scope testing */
syncops fss; / persistent search we're testing against */	syncops fss; / persistent search we're testing against */
Line 582 syncprov_findcsn( Operation *op, find_cs	Line 591 syncprov_findcsn( Operation *op, find_cs
slap_callback cb = {0};	slap_callback cb = {0};
Operation fop;	Operation fop;
SlapReply frs = { REP_RESULT };	SlapReply frs = { REP_RESULT };
char buf[LDAP_LUTIL_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];	char buf[LDAP_PVT_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
struct berval maxcsn;	struct berval maxcsn;
Filter cf;	Filter cf;
AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;	AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;
Line 737 again:	Line 746 again:
return rc;	return rc;
}	}

	/* Should find a place to cache these */
	static mutexint *get_mutexint()
	{
	mutexint *mi = ch_malloc( sizeof( mutexint ));
	ldap_pvt_thread_mutex_init( &mi->mi_mutex );
	mi->mi_int = 1;
	return mi;
	}

	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 );
	}

	/* 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	static void
syncprov_free_syncop( syncops *so )	syncprov_free_syncop( syncops *so )
{	{
Line 760 syncprov_free_syncop( syncops *so )	Line 799 syncprov_free_syncop( syncops *so )
ch_free( so->s_base.bv_val );	ch_free( so->s_base.bv_val );
for ( sr=so->s_res; sr; sr=srnext ) {	for ( sr=so->s_res; sr; sr=srnext ) {
srnext = sr->s_next;	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 );	ch_free( sr );
}	}
ldap_pvt_thread_mutex_destroy( &so->s_mutex );	ldap_pvt_thread_mutex_destroy( &so->s_mutex );
Line 768 syncprov_free_syncop( syncops *so )	Line 813 syncprov_free_syncop( syncops *so )

/* Send a persistent search response */	/* Send a persistent search response */
static int	static int
syncprov_sendresp( Operation op, opcookie opc, syncops *so,	syncprov_sendresp( Operation op, opcookie opc, syncops *so, int mode )
Entry **e, int mode )
{	{
slap_overinst *on = opc->son;	slap_overinst *on = opc->son;

SlapReply rs = { REP_SEARCH };	SlapReply rs = { REP_SEARCH };
LDAPControl *ctrls[2];	LDAPControl *ctrls[2];
struct berval cookie, csns[2];	struct berval cookie = BER_BVNULL, csns[2];
Entry e_uuid = {0};	Entry e_uuid = {0};
Attribute a_uuid = {0};	Attribute a_uuid = {0};

Line 783 syncprov_sendresp( Operation *op, opcook	Line 827 syncprov_sendresp( Operation *op, opcook
return SLAPD_ABANDON;	return SLAPD_ABANDON;

ctrls[1] = NULL;	ctrls[1] = NULL;
csns[0] = opc->sctxcsn;	if ( !BER_BVISNULL( &opc->sctxcsn )) {
BER_BVZERO( &csns[1] );	csns[0] = opc->sctxcsn;
slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 );	BER_BVZERO( &csns[1] );
	slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 );
	}

#ifdef LDAP_DEBUG	#ifdef LDAP_DEBUG
if ( so->s_sid > 0 ) {	if ( so->s_sid > 0 ) {
Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n",	Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n",
so->s_sid, cookie.bv_val, 0 );	so->s_sid, cookie.bv_val ? cookie.bv_val : "", 0 );
} else {	} else {
Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n",	Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n",
cookie.bv_val, 0, 0 );	cookie.bv_val ? cookie.bv_val : "", 0, 0 );
}	}
#endif	#endif

Line 802 syncprov_sendresp( Operation *op, opcook	Line 848 syncprov_sendresp( Operation *op, opcook
a_uuid.a_nvals = &opc->suuid;	a_uuid.a_nvals = &opc->suuid;
rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,	rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,
mode, ctrls, 0, 1, &cookie );	mode, ctrls, 0, 1, &cookie );
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );	if ( !BER_BVISNULL( &cookie )) {
	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
	}

rs.sr_ctrls = ctrls;	rs.sr_ctrls = ctrls;
op->o_bd->bd_info = (BackendInfo *)on->on_info;	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 ) {	switch( mode ) {
case LDAP_SYNC_ADD:	case LDAP_SYNC_ADD:
rs.sr_entry = *e;
if ( rs.sr_entry->e_private )
rs.sr_flags = REP_ENTRY_MUSTRELEASE;
if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {	if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
rs.sr_ref = get_entry_referrals( op, rs.sr_entry );	rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
rs.sr_err = send_search_reference( op, &rs );	rs.sr_err = send_search_reference( op, &rs );
ber_bvarray_free( rs.sr_ref );	ber_bvarray_free( rs.sr_ref );
if ( !rs.sr_entry )
*e = NULL;
break;	break;
}	}
/* fallthru */	/* fallthru */
case LDAP_SYNC_MODIFY:	case LDAP_SYNC_MODIFY:
rs.sr_entry = *e;
if ( rs.sr_entry->e_private )
rs.sr_flags = REP_ENTRY_MUSTRELEASE;
rs.sr_attrs = op->ors_attrs;	rs.sr_attrs = op->ors_attrs;
rs.sr_err = send_search_entry( op, &rs );	rs.sr_err = send_search_entry( op, &rs );
if ( !rs.sr_entry )
*e = NULL;
break;	break;
case LDAP_SYNC_DELETE:	case LDAP_SYNC_DELETE:
e_uuid.e_attrs = NULL;	e_uuid.e_attrs = NULL;
e_uuid.e_name = opc->sdn;	e_uuid.e_name = opc->sdn;
e_uuid.e_nname = opc->sndn;	e_uuid.e_nname = opc->sndn;
rs.sr_entry = &e_uuid;
if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {	if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
struct berval bv = BER_BVNULL;	struct berval bv = BER_BVNULL;
rs.sr_ref = &bv;	rs.sr_ref = &bv;
Line 847 syncprov_sendresp( Operation *op, opcook	Line 889 syncprov_sendresp( Operation *op, opcook
}	}
/* In case someone else freed it already? */	/* In case someone else freed it already? */
if ( rs.sr_ctrls ) {	if ( rs.sr_ctrls ) {
op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );	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;	rs.sr_ctrls = NULL;
}	}

Line 882 syncprov_qplay( Operation op, syncops	Line 931 syncprov_qplay( Operation op, syncops
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );

if ( sr->s_mode == LDAP_SYNC_NEW_COOKIE ) {	if ( sr->s_mode == LDAP_SYNC_NEW_COOKIE ) {
SlapReply rs = { REP_INTERMEDIATE };	SlapReply rs = { REP_INTERMEDIATE };

rc = syncprov_sendinfo( op, &rs, LDAP_TAG_SYNC_NEW_COOKIE,	rc = syncprov_sendinfo( op, &rs, LDAP_TAG_SYNC_NEW_COOKIE,
&sr->s_csn, 0, NULL, 0 );	&sr->s_csn, 0, NULL, 0 );
} else {	} else {
opc.sdn = sr->s_dn;	opc.sdn = sr->s_dn;
Line 892 syncprov_qplay( Operation op, syncops	Line 941 syncprov_qplay( Operation op, syncops
opc.suuid = sr->s_uuid;	opc.suuid = sr->s_uuid;
opc.sctxcsn = sr->s_csn;	opc.sctxcsn = sr->s_csn;
opc.sreference = sr->s_isreference;	opc.sreference = sr->s_isreference;
e = NULL;	opc.se = sr->s_e;

if ( sr->s_mode != LDAP_SYNC_DELETE ) {	rc = syncprov_sendresp( op, &opc, so, sr->s_mode );
rc = overlay_entry_get_ov( op, &opc.sndn, NULL, NULL, 0, &e, on );
if ( rc ) {
Debug( LDAP_DEBUG_SYNC, "syncprov_qplay: failed to get %s, "
"error (%d), ignoring...\n", opc.sndn.bv_val, rc, 0 );
ch_free( sr );
rc = 0;
continue;
}
}
rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode );

if ( e ) {	}
overlay_entry_release_ov( op, e, 0, on );	if ( sr->s_e ) {
	if ( !dec_mutexint( sr->s_e->e_private )) {
	sr->s_e->e_private = NULL;
	entry_free ( sr->s_e );
}	}
}	}

Line 1001 syncprov_qresp( opcookie opc, syncops	Line 1043 syncprov_qresp( opcookie opc, syncops
srsize += cookie.bv_len + 1;	srsize += cookie.bv_len + 1;
sr = ch_malloc( srsize );	sr = ch_malloc( srsize );
sr->s_next = NULL;	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_val = (char *)(sr + 1);
sr->s_dn.bv_len = opc->sdn.bv_len;	sr->s_dn.bv_len = opc->sdn.bv_len;
sr->s_mode = mode;	sr->s_mode = mode;
Line 1144 syncprov_matchops( Operation *op, opcook	Line 1190 syncprov_matchops( Operation *op, opcook
rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on );	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 we're sending responses now, make a copy and unlock the DB */
if ( e && !saveit ) {	if ( e && !saveit ) {
Entry *e2 = entry_dup( e );	if ( !opc->se ) {
	opc->se = entry_dup( e );
	opc->se->e_private = get_mutexint();
	}
overlay_entry_release_ov( op, e, 0, on );	overlay_entry_release_ov( op, e, 0, on );
e = e2;	e = opc->se;
}	}
if ( rc ) {	if ( rc ) {
op->o_bd = b0;	op->o_bd = b0;
Line 1154 syncprov_matchops( Operation *op, opcook	Line 1203 syncprov_matchops( Operation *op, opcook
}	}
} else {	} else {
e = op->ora_e;	e = op->ora_e;
	if ( !saveit ) {
	if ( !opc->se ) {
	opc->se = entry_dup( e );
	opc->se->e_private = get_mutexint();
	}
	e = opc->se;
	}
}	}

if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {	if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {
Line 1183 syncprov_matchops( Operation *op, opcook	Line 1239 syncprov_matchops( Operation *op, opcook
if ( ss->s_op->o_abandon )	if ( ss->s_op->o_abandon )
continue;	continue;

/* First time thru, check for possible skips */	/* Don't send ops back to the originator */
if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {	if ( opc->osid > 0 && opc->osid == ss->s_sid ) {
	Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping original sid %03x\n",
/* Don't send ops back to the originator */	opc->osid, 0, 0 );
if ( opc->osid > 0 && opc->osid == ss->s_sid ) {	continue;
Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping original sid %03x\n",	}
opc->osid, 0, 0 );
continue;
}

/* Don't send ops back to the messenger */	/* Don't send ops back to the messenger */
if ( opc->rsid > 0 && opc->rsid == ss->s_sid ) {	if ( opc->rsid > 0 && opc->rsid == ss->s_sid ) {
Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping relayed sid %03x\n",	Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping relayed sid %03x\n",
opc->rsid, 0, 0 );	opc->rsid, 0, 0 );
continue;	continue;
}
}	}

/* validate base */	/* validate base */
Line 1218 syncprov_matchops( Operation *op, opcook	Line 1270 syncprov_matchops( Operation *op, opcook
continue;	continue;
}	}


/* If we're sending results now, look for this op in old matches */	/* If we're sending results now, look for this op in old matches */
if ( !saveit ) {	if ( !saveit ) {
syncmatches *old;	syncmatches *old;
Line 1246 syncprov_matchops( Operation *op, opcook	Line 1297 syncprov_matchops( Operation *op, opcook
oh = *op->o_hdr;	oh = *op->o_hdr;
oh.oh_conn = ss->s_op->o_conn;	oh.oh_conn = ss->s_op->o_conn;
oh.oh_connid = ss->s_op->o_connid;	oh.oh_connid = ss->s_op->o_connid;
	op2.o_bd = op->o_bd->bd_self;
op2.o_hdr = &oh;	op2.o_hdr = &oh;
op2.o_extra = op->o_extra;	op2.o_extra = op->o_extra;
rc = test_filter( &op2, e, ss->s_op->ors_filter );	op2.o_callback = NULL;
	ldap_pvt_thread_mutex_lock( &ss->s_mutex );
	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",	Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n",
Line 1288 syncprov_matchops( Operation *op, opcook	Line 1349 syncprov_matchops( Operation *op, opcook
if ( !SLAP_ISOVERLAY( op->o_bd )) {	if ( !SLAP_ISOVERLAY( op->o_bd )) {
op->o_bd = &db;	op->o_bd = &db;
}	}
overlay_entry_release_ov( op, e, 0, on );	if ( saveit )
	overlay_entry_release_ov( op, e, 0, on );
op->o_bd = b0;	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 ) {	if ( freefdn ) {
op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );	op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );
}	}
Line 1316 syncprov_op_cleanup( Operation *op, Slap	Line 1385 syncprov_op_cleanup( Operation *op, Slap
/* Remove op from lock table */	/* Remove op from lock table */
mt = opc->smt;	mt = opc->smt;
if ( mt ) {	if ( mt ) {
modinst *mi = mt->mt_mods;	ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
	mt->mt_mods = mt->mt_mods->mi_next;
/* If there are more, promote the next one */	/* If there are more, promote the next one */
if ( mi->mi_next ) {	if ( mt->mt_mods ) {
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
mt->mt_mods = mi->mi_next;
mt->mt_op = mt->mt_mods->mi_op;	mt->mt_op = mt->mt_mods->mi_op;
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );	ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
} else {	} else {
	ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );	ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
avl_delete( &si->si_mods, mt, sp_avl_cmp );	avl_delete( &si->si_mods, mt, sp_avl_cmp );
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
Line 1353 syncprov_checkpoint( Operation *op, Slap	Line 1421 syncprov_checkpoint( Operation *op, Slap
SlapReply rsm = { 0 };	SlapReply rsm = { 0 };
slap_callback cb = {0};	slap_callback cb = {0};
BackendDB be;	BackendDB be;
	BackendInfo *bi;

#ifdef CHECK_CSN	#ifdef CHECK_CSN
Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;	Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;

Line 1379 syncprov_checkpoint( Operation *op, Slap	Line 1449 syncprov_checkpoint( Operation *op, Slap
be = *on->on_info->oi_origdb;	be = *on->on_info->oi_origdb;
opm.o_bd = &be;	opm.o_bd = &be;
}	}
opm.o_req_dn = opm.o_bd->be_suffix[0];	opm.o_req_dn = si->si_contextdn;
opm.o_req_ndn = opm.o_bd->be_nsuffix[0];	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->bd_info = on->on_info->oi_orig;
opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;	opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;
opm.o_no_schema_check = 1;	opm.o_no_schema_check = 1;
opm.o_bd->be_modify( &opm, &rsm );	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 ) {	if ( mod.sml_next != NULL ) {
slap_mods_free( mod.sml_next, 1 );	slap_mods_free( mod.sml_next, 1 );
}	}
Line 1460 syncprov_playlog( Operation *op, SlapRep	Line 1546 syncprov_playlog( Operation *op, SlapRep
slap_overinst on = (slap_overinst )op->o_bd->bd_info;	slap_overinst on = (slap_overinst )op->o_bd->bd_info;
slog_entry *se;	slog_entry *se;
int i, j, ndel, num, nmods, mmods;	int i, j, ndel, num, nmods, mmods;
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
BerVarray uuids;	BerVarray uuids;
struct berval delcsn[2];	struct berval delcsn[2];

Line 1635 syncprov_op_response( Operation *op, Sla	Line 1721 syncprov_op_response( Operation *op, Sla
if ( rs->sr_err == LDAP_SUCCESS )	if ( rs->sr_err == LDAP_SUCCESS )
{	{
struct berval maxcsn;	struct berval maxcsn;
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
int do_check = 0, have_psearches, foundit, csn_changed = 0;	int do_check = 0, have_psearches, foundit, csn_changed = 0;

	ldap_pvt_thread_mutex_lock( &si->si_resp_mutex );

/* Update our context CSN */	/* Update our context CSN */
cbuf[0] = '\0';	cbuf[0] = '\0';
maxcsn.bv_val = cbuf;	maxcsn.bv_val = cbuf;
maxcsn.bv_len = sizeof(cbuf);	maxcsn.bv_len = sizeof(cbuf);
ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );

#if 0	slap_get_commit_csn( op, &maxcsn, &foundit );
if ( op->o_dont_replicate &&	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; i<si->si_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;
	}
	}

	/* 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_op == LDAP_MOD_REPLACE &&
op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {	op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
/* Catch contextCSN updates from syncrepl. We have to look at	/* Catch contextCSN updates from syncrepl. We have to look at
Line 1657 syncprov_op_response( Operation *op, Sla	Line 1787 syncprov_op_response( Operation *op, Sla

for ( i=0; i<mod->sml_numvals; i++ ) {	for ( i=0; i<mod->sml_numvals; i++ ) {
sid = slap_parse_csn_sid( &mod->sml_values[i] );	sid = slap_parse_csn_sid( &mod->sml_values[i] );

for ( j=0; j<si->si_numcsns; j++ ) {	for ( j=0; j<si->si_numcsns; j++ ) {
if ( sid == si->si_sids[j] ) {	if ( sid == si->si_sids[j] ) {
if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {	if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {
Line 1692 syncprov_op_response( Operation *op, Sla	Line 1821 syncprov_op_response( Operation *op, Sla
}	}
}	}
}	}
return SLAP_CB_CONTINUE;	} else {
}
#endif

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; i<si->si_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;
}
} else if ( !foundit ) {
/* internal ops that aren't meant to be replicated */
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
return SLAP_CB_CONTINUE;
}

/* Don't do any processing for consumer contextCSN updates */
if ( op->o_dont_replicate ) {
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
return SLAP_CB_CONTINUE;	}
	goto leave;
}	}

si->si_numops++;	si->si_numops++;
if ( si->si_chkops \|\| si->si_chktime ) {	if ( si->si_chkops \|\| si->si_chktime ) {
if ( si->si_chkops && si->si_numops >= si->si_chkops ) {	/* Never checkpoint adding the context entry,
do_check = 1;	* it will deadlock
si->si_numops = 0;	*/
}	if ( op->o_tag != LDAP_REQ_ADD \|\|
if ( si->si_chktime &&	!dn_match( &op->o_req_ndn, &si->si_contextdn )) {
(op->o_time - si->si_chklast >= si->si_chktime )) {	if ( si->si_chkops && si->si_numops >= si->si_chkops ) {
if ( si->si_chklast ) {
do_check = 1;	do_check = 1;
si->si_chklast = op->o_time;	si->si_numops = 0;
} else {	}
si->si_chklast = 1;	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;
	}
}	}
}	}
}	}
Line 1805 syncprov_op_response( Operation *op, Sla	Line 1891 syncprov_op_response( Operation *op, Sla
if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) {	if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) {
syncprov_add_slog( op );	syncprov_add_slog( op );
}	}
	leave: ldap_pvt_thread_mutex_unlock( &si->si_resp_mutex );
}	}
return SLAP_CB_CONTINUE;	return SLAP_CB_CONTINUE;
}	}
Line 1821 syncprov_op_compare( Operation *op, Slap	Line 1907 syncprov_op_compare( Operation *op, Slap
syncprov_info_t *si = on->on_bi.bi_private;	syncprov_info_t *si = on->on_bi.bi_private;
int rc = SLAP_CB_CONTINUE;	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 )	op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_contextCSN )
{	{
Entry e = {0};	Entry e = {0};
Attribute a = {0};	Attribute a = {0};

e.e_name = op->o_bd->be_suffix[0];	e.e_name = si->si_contextdn;
e.e_nname = op->o_bd->be_nsuffix[0];	e.e_nname = si->si_contextdn;
e.e_attrs = &a;	e.e_attrs = &a;

a.a_desc = slap_schema.si_ad_contextCSN;	a.a_desc = slap_schema.si_ad_contextCSN;
Line 1932 syncprov_op_mod( Operation *op, SlapRepl	Line 2018 syncprov_op_mod( Operation *op, SlapRepl
mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );	mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
if ( mt ) {	if ( mt ) {
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );	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 );	ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
mt->mt_tail->mi_next = mi;	mt->mt_tail->mi_next = mi;
mt->mt_tail = mi;	mt->mt_tail = mi;
Line 2197 syncprov_search_response( Operation *op,	Line 2292 syncprov_search_response( Operation *op,
LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );	LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );
}	}
} else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) {	} 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 ) {	if ( ( ss->ss_flags & SS_CHANGED ) &&
	ss->ss_ctxcsn && !BER_BVISNULL( &ss->ss_ctxcsn[0] )) {
slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,	slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
srs->sr_state.rid, slap_serverID ? slap_serverID : -1 );	srs->sr_state.rid, slap_serverID ? slap_serverID : -1 );

Line 2223 syncprov_search_response( Operation *op,	Line 2319 syncprov_search_response( Operation *op,
LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,	LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL,	( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL,
1, NULL, 0 );	1, NULL, 0 );
if ( ss->ss_flags & SS_CHANGED )	if ( !BER_BVISNULL( &cookie ))
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );

/* Detach this Op from frontend control */	/* Detach this Op from frontend control */
Line 2387 syncprov_op_search( Operation *op, SlapR	Line 2483 syncprov_op_search( Operation *op, SlapR
if ( newer < 0 )	if ( newer < 0 )
changed = SS_CHANGED;	changed = SS_CHANGED;
else if ( newer > 0 ) {	else if ( newer > 0 ) {
/* our state is older, tell consumer nothing */	/* 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 ) {	if ( sop ) {
syncops **sp = &si->si_ops;	syncops **sp = &si->si_ops;

Line 2398 syncprov_op_search( Operation *op, SlapR	Line 2497 syncprov_op_search( Operation *op, SlapR
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
ch_free( sop );	ch_free( sop );
}	}
rs->sr_err = LDAP_SUCCESS;
rs->sr_ctrls = NULL;	rs->sr_ctrls = NULL;
send_ldap_result( op, rs );	send_ldap_result( op, rs );
return rs->sr_err;	return rs->sr_err;
Line 2453 no_change: if ( !(op->o_sync_mode & SLA	Line 2551 no_change: if ( !(op->o_sync_mode & SLA
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );	ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )	if ( sids )
op->o_tmpfree( sids, op->o_tmpmemctx );	op->o_tmpfree( sids, op->o_tmpmemctx );
send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );	rs->sr_err = LDAP_SYNC_REFRESH_REQUIRED;
return rs->sr_err;	rs->sr_text = "sync cookie is stale";
	goto bailout;
}	}
if ( srs->sr_state.ctxcsn ) {	if ( srs->sr_state.ctxcsn ) {
ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx );	ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx );
Line 2474 no_change: if ( !(op->o_sync_mode & SLA	Line 2573 no_change: if ( !(op->o_sync_mode & SLA
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );	ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )	if ( sids )
op->o_tmpfree( sids, op->o_tmpmemctx );	op->o_tmpfree( sids, op->o_tmpmemctx );
send_ldap_result( op, rs );	goto bailout;
return rs->sr_err;
}	}
}	}
} else {	} else {
Line 2557 syncprov_operational(	Line 2655 syncprov_operational(
return SLAP_CB_CONTINUE;	return SLAP_CB_CONTINUE;

if ( rs->sr_entry &&	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 ) \|\|	if ( SLAP_OPATTRS( rs->sr_attr_flags ) \|\|
ad_inlist( slap_schema.si_ad_contextCSN, rs->sr_attrs )) {	ad_inlist( slap_schema.si_ad_contextCSN, rs->sr_attrs )) {
Line 2664 sp_cf_gen(ConfigArgs *c)	Line 2762 sp_cf_gen(ConfigArgs *c)
case SP_CHKPT:	case SP_CHKPT:
if ( si->si_chkops \|\| si->si_chktime ) {	if ( si->si_chkops \|\| si->si_chktime ) {
struct berval bv;	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 ),	bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%d %d", si->si_chkops, si->si_chktime );	"%d %d", si->si_chkops, si->si_chktime/60 );
if ( bv.bv_len >= sizeof( c->cr_msg ) ) {	if ( bv.bv_len >= sizeof( c->cr_msg ) ) {
rc = 1;	rc = 1;
} else {	} else {
Line 2771 sp_cf_gen(ConfigArgs *c)	Line 2872 sp_cf_gen(ConfigArgs *c)
}	}
sl = si->si_logs;	sl = si->si_logs;
if ( !sl ) {	if ( !sl ) {
sl = ch_malloc( sizeof( sessionlog ) + LDAP_LUTIL_CSNSTR_BUFSIZE );	sl = ch_malloc( sizeof( sessionlog ) + LDAP_PVT_CSNSTR_BUFSIZE );
sl->sl_mincsn.bv_val = (char *)(sl+1);	sl->sl_mincsn.bv_val = (char *)(sl+1);
sl->sl_mincsn.bv_len = 0;	sl->sl_mincsn.bv_len = 0;
sl->sl_num = 0;	sl->sl_num = 0;
Line 2841 syncprov_db_open(	Line 2942 syncprov_db_open(
}	}

thrctx = ldap_pvt_thread_pool_context();	thrctx = ldap_pvt_thread_pool_context();
connection_fake_init( &conn, &opbuf, thrctx );	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
op = &opbuf.ob_op;	op = &opbuf.ob_op;
op->o_bd = be;	op->o_bd = be;
op->o_dn = be->be_rootdn;	op->o_dn = be->be_rootdn;
op->o_ndn = be->be_rootndn;	op->o_ndn = be->be_rootndn;

rc = overlay_entry_get_ov( op, be->be_nsuffix, NULL,	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 );	slap_schema.si_ad_contextCSN, 0, &e, on );

if ( e ) {	if ( e ) {
Line 2871 syncprov_db_open(	Line 2978 syncprov_db_open(

/* Didn't find a contextCSN, should we generate one? */	/* Didn't find a contextCSN, should we generate one? */
if ( !si->si_ctxcsn ) {	if ( !si->si_ctxcsn ) {
char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];	char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
struct berval csn;	struct berval csn;

if ( SLAP_SYNC_SHADOW( op->o_bd )) {	if ( SLAP_SYNC_SHADOW( op->o_bd )) {
Line 2920 syncprov_db_close(	Line 3027 syncprov_db_close(
void *thrctx;	void *thrctx;

thrctx = ldap_pvt_thread_pool_context();	thrctx = ldap_pvt_thread_pool_context();
connection_fake_init( &conn, &opbuf, thrctx );	connection_fake_init2( &conn, &opbuf, thrctx, 0 );
op = &opbuf.ob_op;	op = &opbuf.ob_op;
op->o_bd = be;	op->o_bd = be;
op->o_dn = be->be_rootdn;	op->o_dn = be->be_rootdn;
Line 2952 syncprov_db_init(	Line 3059 syncprov_db_init(
ldap_pvt_thread_rdwr_init( &si->si_csn_rwlock );	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_ops_mutex );
ldap_pvt_thread_mutex_init( &si->si_mods_mutex );	ldap_pvt_thread_mutex_init( &si->si_mods_mutex );
	ldap_pvt_thread_mutex_init( &si->si_resp_mutex );

csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN;	csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN;
csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname;	csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname;
Line 2989 syncprov_db_destroy(	Line 3097 syncprov_db_destroy(
ber_bvarray_free( si->si_ctxcsn );	ber_bvarray_free( si->si_ctxcsn );
if ( si->si_sids )	if ( si->si_sids )
ch_free( 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_mods_mutex );
ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );	ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );
ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock );

Removed from v.1.147.2.54
changed lines
	Added in v.1.147.2.76