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.310

version 1.147.2.92, 2011/01/31 19:05:48	version 1.310, 2010/04/13 20:18:25
Line 1	Line 1
/* $OpenLDAP$ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.309 2010/01/21 12:33:21 ralf 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-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 133 typedef struct syncprov_info_t {	Line 133 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 225 syncprov_state_ctrl(	Line 222 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 268 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 335 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 733 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 820 syncprov_free_syncop( syncops *so )	Line 816 syncprov_free_syncop( syncops *so )
static int	static int
syncprov_sendresp( Operation op, opcookie opc, syncops *so, int mode )	syncprov_sendresp( Operation op, opcookie opc, syncops *so, 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 915 syncprov_qplay( Operation op, syncops	Line 913 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 1295 syncprov_matchops( Operation *op, opcook	Line 1294 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 1302 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 1376 syncprov_op_cleanup( Operation *op, Slap	Line 1367 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 1406 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 1443 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 1454 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 1482 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 1500 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 1595 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 1635 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 1665 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 1824 syncprov_op_response( Operation *op, Sla	Line 1773 syncprov_op_response( Operation *op, Sla
* that changed, and only one can be passed in the csn queue.	* that changed, and only one can be passed in the csn queue.
*/	*/
Modifications *mod = op->orm_modlist;	Modifications *mod = op->orm_modlist;
unsigned i;	int i, j, sid;
int j, sid;

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] );
Line 1848 syncprov_op_response( Operation *op, Sla	Line 1796 syncprov_op_response( Operation *op, Sla
csn_changed = 1;	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 ) {	if ( csn_changed ) {
syncops *ss;
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
for ( ss = si->si_ops; ss; ss = ss->s_next ) {	have_psearches = ( si->si_ops != NULL );
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 );	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 );
	}
	}
}	}
} else {	} else {
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
Line 1896 syncprov_op_response( Operation *op, Sla	Line 1839 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 1878 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 1966 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 2271 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 2355 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 2400 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 2417 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 2454 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 2473 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_err = LDAP_SUCCESS;
rs->sr_text = "consumer state is newer than provider!";
bailout:	bailout:
if ( sop ) {	if ( sop ) {
syncops **sp = &si->si_ops;	syncops **sp = &si->si_ops;
Line 2587 bailout:	Line 2495 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 2671 shortcut:	Line 2579 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 2595 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 2620 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 2666 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 2989 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 3012 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 3021 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 3080 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.310