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.92 and 1.300

version 1.147.2.92, 2011/01/31 19:05:48	version 1.300, 2009/11/21 02:38:13
Line 1	Line 1
/* $OpenLDAP$ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.298 2009/11/19 10:17:53 hyc Exp $ */
/* 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-2011 The OpenLDAP Foundation.	* Copyright 2004-2009 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 133 typedef struct syncprov_info_t {	Line 132 typedef struct syncprov_info_t {
int si_numops; /* number of ops since last checkpoint */	int si_numops; /* number of ops since last checkpoint */
int si_nopres; /* Skip present phase */	int si_nopres; /* Skip present phase */
int si_usehint; /* use reload hint */	int si_usehint; /* use reload hint */
int si_active; /* True if there are active mods */
int si_dirty; /* True if the context is dirty, i.e changes
* have been made without updating the csn. */
time_t si_chklast; /* time of last checkpoint */	time_t si_chklast; /* time of last checkpoint */
Avlnode si_mods; / entries being modified */	Avlnode si_mods; / entries being modified */
sessionlog *si_logs;	sessionlog *si_logs;
Line 149 typedef struct opcookie {	Line 145 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 159 typedef struct opcookie {	Line 154 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 225 syncprov_state_ctrl(	Line 215 syncprov_state_ctrl(

if ( ret < 0 ) {	if ( ret < 0 ) {
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"slap_build_sync_ctrl: ber_flatten2 failed (%d)\n",	"slap_build_sync_ctrl: ber_flatten2 failed\n",
ret, 0, 0 );	0, 0, 0 );
send_ldap_error( op, rs, LDAP_OTHER, "internal error" );	send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
return LDAP_OTHER;	return ret;
}	}

return LDAP_SUCCESS;	return LDAP_SUCCESS;
Line 271 syncprov_done_ctrl(	Line 261 syncprov_done_ctrl(

if ( ret < 0 ) {	if ( ret < 0 ) {
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"syncprov_done_ctrl: ber_flatten2 failed (%d)\n",	"syncprov_done_ctrl: ber_flatten2 failed\n",
ret, 0, 0 );	0, 0, 0 );
send_ldap_error( op, rs, LDAP_OTHER, "internal error" );	send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
return LDAP_OTHER;	return ret;
}	}

return LDAP_SUCCESS;	return LDAP_SUCCESS;
Line 338 syncprov_sendinfo(	Line 328 syncprov_sendinfo(

if ( ret < 0 ) {	if ( ret < 0 ) {
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"syncprov_sendinfo: ber_flatten2 failed (%d)\n",	"syncprov_sendinfo: ber_flatten2 failed\n",
ret, 0, 0 );	0, 0, 0 );
send_ldap_error( op, rs, LDAP_OTHER, "internal error" );	send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
return LDAP_OTHER;	return ret;
}	}

rs->sr_rspoid = LDAP_SYNC_INFO;	rs->sr_rspoid = LDAP_SYNC_INFO;
Line 736 again:	Line 726 again:
/* If we didn't find an exact match, then try for <= */	/* If we didn't find an exact match, then try for <= */
if ( findcsn_retry ) {	if ( findcsn_retry ) {
findcsn_retry = 0;	findcsn_retry = 0;
rs_reinit( &frs, REP_RESULT );
goto again;	goto again;
}	}
rc = LDAP_NO_SUCH_OBJECT;	rc = LDAP_NO_SUCH_OBJECT;
Line 750 again:	Line 739 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 787 syncprov_free_syncop( syncops *so )	Line 746 syncprov_free_syncop( syncops *so )
GroupAssertion ga, gnext;	GroupAssertion ga, gnext;

ldap_pvt_thread_mutex_lock( &so->s_mutex );	ldap_pvt_thread_mutex_lock( &so->s_mutex );
/* already being freed, or still in use */	if ( --so->s_inuse > 0 ) {
if ( !so->s_inuse \|\| --so->s_inuse > 0 ) {
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
return;	return;
}	}
Line 804 syncprov_free_syncop( syncops *so )	Line 762 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 818 syncprov_free_syncop( syncops *so )	Line 770 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, int mode )	syncprov_sendresp( Operation op, opcookie opc, syncops *so,
	Entry **e, int mode )
{	{
	slap_overinst *on = opc->son;

SlapReply rs = { REP_SEARCH };	SlapReply rs = { REP_SEARCH };
LDAPControl *ctrls[2];	LDAPControl *ctrls[2];
struct berval cookie = BER_BVNULL, csns[2];	struct berval cookie = BER_BVNULL, csns[2];
Line 856 syncprov_sendresp( Operation *op, opcook	Line 811 syncprov_sendresp( Operation *op, opcook
}	}

rs.sr_ctrls = ctrls;	rs.sr_ctrls = ctrls;
rs.sr_entry = &e_uuid;	op->o_bd->bd_info = (BackendInfo *)on->on_info;
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 915 syncprov_qplay( Operation op, syncops	Line 876 syncprov_qplay( Operation op, syncops
{	{
slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;	slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
syncres *sr;	syncres *sr;
	Entry *e;
opcookie opc;	opcookie opc;
int rc = 0;	int rc = 0;

Line 933 syncprov_qplay( Operation op, syncops	Line 895 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 943 syncprov_qplay( Operation op, syncops	Line 905 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;
opc.se = sr->s_e;	e = NULL;

rc = syncprov_sendresp( op, &opc, so, sr->s_mode );	if ( sr->s_mode != LDAP_SYNC_DELETE ) {
	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 ) {
if ( sr->s_e ) {	overlay_entry_release_ov( op, e, 0, on );
if ( !dec_mutexint( sr->s_e->e_private )) {
sr->s_e->e_private = NULL;
entry_free ( sr->s_e );
}	}
}	}

Line 1045 syncprov_qresp( opcookie opc, syncops	Line 1014 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 1192 syncprov_matchops( Operation *op, opcook	Line 1157 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 ) {
if ( !opc->se ) {	Entry *e2 = entry_dup( e );
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 = opc->se;	e = e2;
}	}
if ( rc ) {	if ( rc ) {
op->o_bd = b0;	op->o_bd = b0;
Line 1205 syncprov_matchops( Operation *op, opcook	Line 1167 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 1272 syncprov_matchops( Operation *op, opcook	Line 1227 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 1295 syncprov_matchops( Operation *op, opcook	Line 1251 syncprov_matchops( Operation *op, opcook
}	}

if ( fc.fscope ) {	if ( fc.fscope ) {
ldap_pvt_thread_mutex_lock( &ss->s_mutex );
op2 = *ss->s_op;	op2 = *ss->s_op;
oh = *op->o_hdr;	oh = *op->o_hdr;
oh.oh_conn = ss->s_op->o_conn;	oh.oh_conn = ss->s_op->o_conn;
Line 1304 syncprov_matchops( Operation *op, opcook	Line 1259 syncprov_matchops( Operation *op, opcook
op2.o_hdr = &oh;	op2.o_hdr = &oh;
op2.o_extra = op->o_extra;	op2.o_extra = op->o_extra;
op2.o_callback = NULL;	op2.o_callback = NULL;
if (ss->s_flags & PS_FIX_FILTER) {	rc = test_filter( &op2, e, ss->s_op->ors_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 1351 syncprov_matchops( Operation *op, opcook	Line 1299 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;
}	}
if ( saveit )	overlay_entry_release_ov( op, e, 0, on );
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 1376 syncprov_op_cleanup( Operation *op, Slap	Line 1316 syncprov_op_cleanup( Operation *op, Slap
slap_overinst *on = opc->son;	slap_overinst *on = opc->son;
syncprov_info_t *si = on->on_bi.bi_private;	syncprov_info_t *si = on->on_bi.bi_private;
syncmatches sm, snext;	syncmatches sm, snext;
modtarget *mt;	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) {	for (sm = opc->smatches; sm; sm=snext) {
snext = sm->sm_next;	snext = sm->sm_next;
Line 1420 syncprov_op_cleanup( Operation *op, Slap	Line 1355 syncprov_op_cleanup( Operation *op, Slap
}	}

static void	static void
syncprov_checkpoint( Operation op, slap_overinst on )	syncprov_checkpoint( Operation op, SlapReply rs, slap_overinst *on )
{	{
syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;	syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;
Modifications mod;	Modifications mod;
Operation opm;	Operation opm;
SlapReply rsm = {REP_RESULT};	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 1458 syncprov_checkpoint( Operation *op, slap	Line 1392 syncprov_checkpoint( Operation *op, slap
}	}
opm.o_req_dn = si->si_contextdn;	opm.o_req_dn = si->si_contextdn;
opm.o_req_ndn = 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->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;
Line 1470 syncprov_checkpoint( Operation *op, slap	Line 1403 syncprov_checkpoint( Operation *op, slap
char txtbuf[SLAP_TEXT_BUFLEN];	char txtbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof txtbuf;	size_t textlen = sizeof txtbuf;
Entry *e = slap_create_context_csn_entry( opm.o_bd, NULL );	Entry *e = slap_create_context_csn_entry( opm.o_bd, NULL );
rs_reinit( &rsm, REP_RESULT );
slap_mods2entry( &mod, &e, 0, 1, &text, txtbuf, textlen);	slap_mods2entry( &mod, &e, 0, 1, &text, txtbuf, textlen);
opm.ora_e = e;	opm.ora_e = e;
opm.o_bd->be_add( &opm, &rsm );	opm.o_bd->be_add( &opm, &rsm );
if ( e == opm.ora_e )	if ( e == opm.ora_e )
be_entry_release_w( &opm, 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 1500 syncprov_add_slog( Operation *op )	Line 1431 syncprov_add_slog( Operation *op )

sl = si->si_logs;	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. */	/* Allocate a record. UUIDs are not NUL-terminated. */
se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +	se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +
op->o_csn.bv_len + 1 );	op->o_csn.bv_len + 1 );
Line 1535 syncprov_add_slog( Operation *op )	Line 1449 syncprov_add_slog( Operation *op )

ldap_pvt_thread_mutex_lock( &sl->sl_mutex );	ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
if ( sl->sl_head ) {	if ( sl->sl_head ) {
/* Keep the list in csn order. */	sl->sl_tail->se_next = se;
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 {	} else {
sl->sl_head = se;	sl->sl_head = se;
sl->sl_tail = se;
}	}
	sl->sl_tail = se;
sl->sl_num++;	sl->sl_num++;
while ( sl->sl_num > sl->sl_size ) {	while ( sl->sl_num > sl->sl_size ) {
se = sl->sl_head;	se = sl->sl_head;
sl->sl_head = se->se_next;	sl->sl_head = se->se_next;
AC_MEMCPY( sl->sl_mincsn.bv_val, se->se_csn.bv_val, se->se_csn.bv_len );	strcpy( sl->sl_mincsn.bv_val, se->se_csn.bv_val );
sl->sl_mincsn.bv_len = se->se_csn.bv_len;	sl->sl_mincsn.bv_len = se->se_csn.bv_len;
ch_free( se );	ch_free( se );
sl->sl_num--;	sl->sl_num--;
Line 1644 syncprov_playlog( Operation *op, SlapRep	Line 1544 syncprov_playlog( Operation *op, SlapRep
delcsn[0].bv_len = se->se_csn.bv_len;	delcsn[0].bv_len = se->se_csn.bv_len;
delcsn[0].bv_val[delcsn[0].bv_len] = '\0';	delcsn[0].bv_val[delcsn[0].bv_len] = '\0';
} else {	} else {
if ( se->se_tag == LDAP_REQ_ADD )
continue;
nmods++;	nmods++;
j = num - nmods;	j = num - nmods;
}	}
Line 1686 syncprov_playlog( Operation *op, SlapRep	Line 1584 syncprov_playlog( Operation *op, SlapRep

if ( mmods ) {	if ( mmods ) {
Operation fop;	Operation fop;
	SlapReply frs = { REP_RESULT };
int rc;	int rc;
Filter mf, af;	Filter mf, af;
AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;	AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;
Line 1715 syncprov_playlog( Operation *op, SlapRep	Line 1614 syncprov_playlog( Operation *op, SlapRep
fop.o_bd->bd_info = (BackendInfo *)on->on_info;	fop.o_bd->bd_info = (BackendInfo *)on->on_info;

for ( i=ndel; i<num; i++ ) {	for ( i=ndel; i<num; i++ ) {
if ( uuids[i].bv_len != 0 ) {	if ( uuids[i].bv_len == 0 ) continue;
SlapReply frs = { REP_RESULT };

mf.f_av_value = uuids[i];	mf.f_av_value = uuids[i];
cb.sc_private = NULL;	cb.sc_private = NULL;
fop.ors_slimit = 1;	fop.ors_slimit = 1;
	frs.sr_nentries = 0;
rc = fop.o_bd->be_search( &fop, &frs );	rc = fop.o_bd->be_search( &fop, &frs );

/* If entry was not found, add to delete list */	/* If entry was not found, add to delete list */
if ( !cb.sc_private ) {	if ( !cb.sc_private ) {
uuids[ndel++] = uuids[i];	uuids[ndel++] = uuids[i];
}	}
}
}	}
fop.o_bd->bd_info = (BackendInfo *)on;	fop.o_bd->bd_info = (BackendInfo *)on;
}	}
Line 1773 syncprov_op_response( Operation *op, Sla	Line 1671 syncprov_op_response( Operation *op, Sla
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 ( op->o_dont_replicate && 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; i<mod->sml_numvals; i++ ) {
	sid = slap_parse_csn_sid( &mod->sml_values[i] );

	for ( j=0; j<si->si_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;
	}
	}
	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );

	if ( csn_changed ) {
	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 ) {
	for ( sm = opc->smatches; sm; sm=sm->sm_next ) {
	if ( sm->sm_op->s_op->o_abandon )
	continue;
	syncprov_qresp( opc, sm->sm_op, LDAP_SYNC_NEW_COOKIE );
	}
	}
	}
	goto leave;
	}

slap_get_commit_csn( op, &maxcsn, &foundit );	slap_get_commit_csn( op, &maxcsn, &foundit );
if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {	if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {
/* syncrepl queues the CSN values in the db where	/* syncrepl queues the CSN values in the db where
Line 1812 syncprov_op_response( Operation *op, Sla	Line 1760 syncprov_op_response( Operation *op, Sla
sizeof(int));	sizeof(int));
si->si_sids[i] = sid;	si->si_sids[i] = sid;
}	}
	#if 0
	} 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;
	#endif
}	}

/* Don't do any processing for consumer contextCSN updates */	/* Don't do any processing for consumer contextCSN updates */
if ( op->o_dont_replicate ) {	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;
unsigned i;
int j, sid;

for ( i=0; i<mod->sml_numvals; i++ ) {
sid = slap_parse_csn_sid( &mod->sml_values[i] );
for ( j=0; j<si->si_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 );	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 );
}
} else {
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
}
goto leave;	goto leave;
}	}

Line 1896 syncprov_op_response( Operation *op, Sla	Line 1796 syncprov_op_response( Operation *op, Sla
}	}
}	}
}	}
si->si_dirty = !csn_changed;
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );

if ( do_check ) {	if ( do_check ) {
ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
syncprov_checkpoint( op, on );	syncprov_checkpoint( op, rs, on );
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
}	}

Line 1936 syncprov_op_response( Operation *op, Sla	Line 1835 syncprov_op_response( Operation *op, Sla
}	}

/* Add any log records */	/* Add any log records */
if ( si->si_logs ) {	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 );	leave: ldap_pvt_thread_mutex_unlock( &si->si_resp_mutex );
Line 2024 syncprov_op_mod( Operation *op, SlapRepl	Line 1923 syncprov_op_mod( Operation *op, SlapRepl

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
have_psearches = ( si->si_ops != NULL );	have_psearches = ( si->si_ops != NULL );
si->si_active++;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );

cbsize = sizeof(slap_callback) + sizeof(opcookie) +	cbsize = sizeof(slap_callback) + sizeof(opcookie) +
Line 2330 syncprov_search_response( Operation *op,	Line 2228 syncprov_search_response( Operation *op,
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,	rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,
op->o_tmpmemctx );	op->o_tmpmemctx );
rs->sr_ctrls[1] = NULL;	rs->sr_ctrls[1] = NULL;
rs->sr_flags \|= REP_CTRLS_MUSTBEFREED;
/* If we're in delta-sync mode, always send a cookie */	/* If we're in delta-sync mode, always send a cookie */
if ( si->si_nopres && si->si_usehint && a ) {	if ( si->si_nopres && si->si_usehint && a ) {
struct berval cookie;	struct berval cookie;
Line 2415 syncprov_op_search( Operation *op, SlapR	Line 2312 syncprov_op_search( Operation *op, SlapR
sync_control *srs;	sync_control *srs;
BerVarray ctxcsn;	BerVarray ctxcsn;
int i, *sids, numcsns;	int i, *sids, numcsns;
struct berval mincsn, maxcsn;	struct berval mincsn;
int dirty = 0;

if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE;	if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE;

Line 2461 syncprov_op_search( Operation *op, SlapR	Line 2357 syncprov_op_search( Operation *op, SlapR
sop->s_inuse = 1;	sop->s_inuse = 1;

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	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;	sop->s_next = si->si_ops;
si->si_ops = sop;	si->si_ops = sop;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
Line 2492 syncprov_op_search( Operation *op, SlapR	Line 2374 syncprov_op_search( Operation *op, SlapR
ctxcsn = NULL;	ctxcsn = NULL;
sids = NULL;	sids = NULL;
}	}
dirty = si->si_dirty;
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );

/* If we have a cookie, handle the PRESENT lookups */	/* If we have a cookie, handle the PRESENT lookups */
Line 2530 syncprov_op_search( Operation *op, SlapR	Line 2411 syncprov_op_search( Operation *op, SlapR
i++;	i++;
}	}

/* Find the smallest CSN which differs from contextCSN */	/* Find the smallest CSN */
mincsn.bv_len = 0;	mincsn = srs->sr_state.ctxcsn[0];
maxcsn.bv_len = 0;	for ( i=1; i<srs->sr_state.numcsns; i++ ) {
for ( i=0; i<srs->sr_state.numcsns; i++ ) {	if ( ber_bvcmp( &mincsn, &srs->sr_state.ctxcsn[i] ) > 0 )
for ( j=0; j<numcsns; j++ ) {	mincsn = srs->sr_state.ctxcsn[i];
if ( srs->sr_state.sids[i] != sids[j] )	}
continue;
if ( BER_BVISEMPTY( &maxcsn ) \|\| ber_bvcmp( &maxcsn,
&srs->sr_state.ctxcsn[i] ) < 0 ) {
maxcsn = srs->sr_state.ctxcsn[i];
}
if ( ber_bvcmp( &srs->sr_state.ctxcsn[i], &ctxcsn[j] ) < 0) {
if ( BER_BVISEMPTY( &mincsn ) \|\| ber_bvcmp( &mincsn,
&srs->sr_state.ctxcsn[i] ) > 0 ) {
mincsn = srs->sr_state.ctxcsn[i];
}
}
}
}
if ( BER_BVISEMPTY( &mincsn ))
mincsn = maxcsn;

/* If nothing has changed, shortcut it */	/* If nothing has changed, shortcut it */
if ( srs->sr_state.numcsns == numcsns ) {	if ( srs->sr_state.numcsns == numcsns ) {
Line 2564 syncprov_op_search( Operation *op, SlapR	Line 2430 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, complain to consumer */	/* our state is older, tell consumer nothing */
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 2578 bailout:	Line 2441 bailout:
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 2587 bailout:	Line 2451 bailout:
if ( changed )	if ( changed )
break;	break;
}	}
if ( !changed && !dirty ) {	if ( !changed ) {
do_present = 0;	do_present = 0;
no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {	no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
LDAPControl *ctrls[2];	LDAPControl *ctrls[2];
Line 2632 no_change: if ( !(op->o_sync_mode & SLA	Line 2496 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 );
rs->sr_err = LDAP_SYNC_REFRESH_REQUIRED;	send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
rs->sr_text = "sync cookie is stale";	return rs->sr_err;
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 2654 no_change: if ( !(op->o_sync_mode & SLA	Line 2517 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 );
goto bailout;	send_ldap_result( op, rs );
	return rs->sr_err;
}	}
}	}
} else {	} else {
Line 2671 shortcut:	Line 2535 shortcut:
}	}

/* If something changed, find the changes */	/* If something changed, find the changes */
if ( gotstate && ( changed \|\| dirty ) ) {	if ( gotstate && changed ) {
Filter fand, fava;	Filter fand, fava;

fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );	fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );
Line 2687 shortcut:	Line 2551 shortcut:
#endif	#endif
ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );	ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );
fava->f_next = op->ors_filter;	fava->f_next = op->ors_filter;
if ( sop )
ldap_pvt_thread_mutex_lock( &sop->s_mutex );
op->ors_filter = fand;	op->ors_filter = fand;
filter2bv_x( op, op->ors_filter, &op->ors_filterstr );	filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
if ( sop ) {	if ( sop )
sop->s_flags \|= PS_FIX_FILTER;	sop->s_flags \|= PS_FIX_FILTER;
ldap_pvt_thread_mutex_unlock( &sop->s_mutex );
}
}	}

/* Let our callback add needed info to returned entries */	/* Let our callback add needed info to returned entries */
Line 2716 shortcut:	Line 2576 shortcut:
* the refresh phase, just invoke the response callback to transition	* the refresh phase, just invoke the response callback to transition
* us into persist phase	* us into persist phase
*/	*/
if ( !changed && !dirty ) {	if ( !changed ) {
rs->sr_err = LDAP_SUCCESS;	rs->sr_err = LDAP_SUCCESS;
rs->sr_nentries = 0;	rs->sr_nentries = 0;
send_ldap_result( op, rs );	send_ldap_result( op, rs );
Line 2762 syncprov_operational(	Line 2622 syncprov_operational(
}	}

if ( !ap ) {	if ( !ap ) {
if ( rs_entry2modifiable( op, rs, on )) {	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,	a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_contextCSN );	slap_schema.si_ad_contextCSN );
}	}
Line 3075 syncprov_db_open(	Line 2945 syncprov_db_open(
si->si_numops++;	si->si_numops++;
}	}

/* Initialize the sessionlog mincsn */
if ( si->si_logs && si->si_numcsns ) {
sessionlog *sl = si->si_logs;
int i;
/* If there are multiple, find the newest */
for ( i=0; i < si->si_numcsns; i++ ) {
if ( ber_bvcmp( &sl->sl_mincsn, &si->si_ctxcsn[i] ) < 0 ) {
AC_MEMCPY( sl->sl_mincsn.bv_val, si->si_ctxcsn[i].bv_val,
si->si_ctxcsn[i].bv_len );
sl->sl_mincsn.bv_len = si->si_ctxcsn[i].bv_len;
}
}
}

out:	out:
op->o_bd->bd_info = (BackendInfo *)on;	op->o_bd->bd_info = (BackendInfo *)on;
return 0;	return 0;
Line 3112 syncprov_db_close(	Line 2968 syncprov_db_close(
Connection conn = {0};	Connection conn = {0};
OperationBuffer opbuf;	OperationBuffer opbuf;
Operation *op;	Operation *op;
	SlapReply rs = {REP_RESULT};
void *thrctx;	void *thrctx;

thrctx = ldap_pvt_thread_pool_context();	thrctx = ldap_pvt_thread_pool_context();
Line 3120 syncprov_db_close(	Line 2977 syncprov_db_close(
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;
syncprov_checkpoint( op, on );	syncprov_checkpoint( op, &rs, on );
}	}

return 0;	return 0;
Line 3179 syncprov_db_destroy(	Line 3036 syncprov_db_destroy(
se = se_next;	se = se_next;
}	}

ldap_pvt_thread_mutex_destroy(&si->si_logs->sl_mutex);
ch_free( si->si_logs );	ch_free( si->si_logs );
}	}
if ( si->si_ctxcsn )	if ( si->si_ctxcsn )

Removed from v.1.147.2.92
changed lines
	Added in v.1.300