--- servers/slapd/overlays/syncprov.c 2011/01/04 18:25:20 1.147.2.82
+++ servers/slapd/overlays/syncprov.c 2009/11/19 10:17:53 1.298
@@ -1,8 +1,8 @@
-/* $OpenLDAP$ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.297 2009/11/15 09:38:13 hyc Exp $ */
/* syncprov.c - syncrepl provider */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2004-2010 The OpenLDAP Foundation.
+ * Copyright 2004-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,6 @@ typedef struct modtarget {
/* A queued result of a persistent search */
typedef struct syncres {
struct syncres *s_next;
- Entry *s_e;
struct berval s_dn;
struct berval s_ndn;
struct berval s_uuid;
@@ -113,6 +112,7 @@ typedef struct slog_entry {
} slog_entry;
typedef struct sessionlog {
+ struct berval sl_mincsn;
int sl_num;
int sl_size;
slog_entry *sl_head;
@@ -132,9 +132,6 @@ typedef struct syncprov_info_t {
int si_numops; /* number of ops since last checkpoint */
int si_nopres; /* Skip present phase */
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 */
Avlnode *si_mods; /* entries being modified */
sessionlog *si_logs;
@@ -148,7 +145,6 @@ typedef struct opcookie {
slap_overinst *son;
syncmatches *smatches;
modtarget *smt;
- Entry *se;
struct berval sdn; /* DN of entry, for deletes */
struct berval sndn;
struct berval suuid; /* UUID of entry */
@@ -158,11 +154,6 @@ typedef struct opcookie {
short sreference; /* Is the entry a reference? */
} opcookie;
-typedef struct mutexint {
- ldap_pvt_thread_mutex_t mi_mutex;
- int mi_int;
-} mutexint;
-
typedef struct fbase_cookie {
struct berval *fdn; /* DN of a modified entry, for scope testing */
syncops *fss; /* persistent search we're testing against */
@@ -748,36 +739,6 @@ again:
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
syncprov_free_syncop( syncops *so )
{
@@ -801,12 +762,6 @@ syncprov_free_syncop( syncops *so )
ch_free( so->s_base.bv_val );
for ( sr=so->s_res; sr; sr=srnext ) {
srnext = sr->s_next;
- if ( sr->s_e ) {
- if ( !dec_mutexint( sr->s_e->e_private )) {
- sr->s_e->e_private = NULL;
- entry_free( sr->s_e );
- }
- }
ch_free( sr );
}
ldap_pvt_thread_mutex_destroy( &so->s_mutex );
@@ -815,7 +770,8 @@ syncprov_free_syncop( syncops *so )
/* Send a persistent search response */
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;
@@ -836,13 +792,15 @@ syncprov_sendresp( Operation *op, opcook
}
#ifdef LDAP_DEBUG
- if ( so->s_sid > 0 ) {
- Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n",
- so->s_sid, cookie.bv_val ? cookie.bv_val : "", 0 );
- } else {
- Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n",
- cookie.bv_val ? cookie.bv_val : "", 0, 0 );
- }
+ if ( !BER_BVISNULL( &cookie )) {
+ if ( so->s_sid > 0 ) {
+ Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n",
+ so->s_sid, cookie.bv_val , 0 );
+ } else {
+ Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n",
+ cookie.bv_val, 0, 0 );
+ }
+ }
#endif
e_uuid.e_attrs = &a_uuid;
@@ -855,29 +813,35 @@ syncprov_sendresp( Operation *op, opcook
}
rs.sr_ctrls = ctrls;
- rs.sr_entry = &e_uuid;
- if ( mode == LDAP_SYNC_ADD || mode == LDAP_SYNC_MODIFY ) {
- e_uuid = *opc->se;
- e_uuid.e_private = NULL;
- }
-
+ op->o_bd->bd_info = (BackendInfo *)on->on_info;
switch( mode ) {
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 ) {
rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
rs.sr_err = send_search_reference( op, &rs );
ber_bvarray_free( rs.sr_ref );
+ if ( !rs.sr_entry )
+ *e = NULL;
break;
}
/* fallthru */
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_err = send_search_entry( op, &rs );
+ if ( !rs.sr_entry )
+ *e = NULL;
break;
case LDAP_SYNC_DELETE:
e_uuid.e_attrs = NULL;
e_uuid.e_name = opc->sdn;
e_uuid.e_nname = opc->sndn;
+ rs.sr_entry = &e_uuid;
if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
struct berval bv = BER_BVNULL;
rs.sr_ref = &bv;
@@ -933,9 +897,9 @@ syncprov_qplay( Operation *op, syncops *
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
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 );
} else {
opc.sdn = sr->s_dn;
@@ -943,15 +907,22 @@ syncprov_qplay( Operation *op, syncops *
opc.suuid = sr->s_uuid;
opc.sctxcsn = sr->s_csn;
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 ( sr->s_e ) {
- if ( !dec_mutexint( sr->s_e->e_private )) {
- sr->s_e->e_private = NULL;
- entry_free ( sr->s_e );
+ if ( e ) {
+ overlay_entry_release_ov( op, e, 0, on );
}
}
@@ -1045,10 +1016,6 @@ syncprov_qresp( opcookie *opc, syncops *
srsize += cookie.bv_len + 1;
sr = ch_malloc( srsize );
sr->s_next = NULL;
- sr->s_e = opc->se;
- /* bump refcount on this entry */
- if ( opc->se )
- inc_mutexint( opc->se->e_private );
sr->s_dn.bv_val = (char *)(sr + 1);
sr->s_dn.bv_len = opc->sdn.bv_len;
sr->s_mode = mode;
@@ -1192,12 +1159,9 @@ syncprov_matchops( Operation *op, opcook
rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on );
/* If we're sending responses now, make a copy and unlock the DB */
if ( e && !saveit ) {
- if ( !opc->se ) {
- opc->se = entry_dup( e );
- opc->se->e_private = get_mutexint();
- }
+ Entry *e2 = entry_dup( e );
overlay_entry_release_ov( op, e, 0, on );
- e = opc->se;
+ e = e2;
}
if ( rc ) {
op->o_bd = b0;
@@ -1205,13 +1169,6 @@ syncprov_matchops( Operation *op, opcook
}
} else {
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 ) {
@@ -1272,6 +1229,7 @@ syncprov_matchops( Operation *op, opcook
continue;
}
+
/* If we're sending results now, look for this op in old matches */
if ( !saveit ) {
syncmatches *old;
@@ -1295,7 +1253,6 @@ syncprov_matchops( Operation *op, opcook
}
if ( fc.fscope ) {
- ldap_pvt_thread_mutex_lock( &ss->s_mutex );
op2 = *ss->s_op;
oh = *op->o_hdr;
oh.oh_conn = ss->s_op->o_conn;
@@ -1304,14 +1261,7 @@ syncprov_matchops( Operation *op, opcook
op2.o_hdr = &oh;
op2.o_extra = op->o_extra;
op2.o_callback = NULL;
- if (ss->s_flags & PS_FIX_FILTER) {
- /* Skip the AND/GE clause that we stuck on in front. We
- would lose deletes/mods that happen during the refresh
- phase otherwise (ITS#6555) */
- op2.ors_filter = ss->s_op->ors_filter->f_and->f_next;
- }
- ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
- rc = test_filter( &op2, e, op2.ors_filter );
+ rc = test_filter( &op2, e, ss->s_op->ors_filter );
}
Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n",
@@ -1351,17 +1301,9 @@ syncprov_matchops( Operation *op, opcook
if ( !SLAP_ISOVERLAY( op->o_bd )) {
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;
}
- if ( opc->se && !saveit ) {
- if ( !dec_mutexint( opc->se->e_private )) {
- opc->se->e_private = NULL;
- entry_free( opc->se );
- opc->se = NULL;
- }
- }
if ( freefdn ) {
op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );
}
@@ -1378,11 +1320,6 @@ syncprov_op_cleanup( Operation *op, Slap
syncmatches *sm, *snext;
modtarget *mt, mtdummy;
- ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
- if ( si->si_active )
- si->si_active--;
- ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
-
for (sm = opc->smatches; sm; sm=snext) {
snext = sm->sm_next;
syncprov_free_syncop( sm->sm_op );
@@ -1428,7 +1365,6 @@ syncprov_checkpoint( Operation *op, Slap
SlapReply rsm = { 0 };
slap_callback cb = {0};
BackendDB be;
- BackendInfo *bi;
#ifdef CHECK_CSN
Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;
@@ -1458,7 +1394,6 @@ syncprov_checkpoint( Operation *op, Slap
}
opm.o_req_dn = si->si_contextdn;
opm.o_req_ndn = si->si_contextdn;
- bi = opm.o_bd->bd_info;
opm.o_bd->bd_info = on->on_info->oi_orig;
opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;
opm.o_no_schema_check = 1;
@@ -1476,7 +1411,6 @@ syncprov_checkpoint( Operation *op, Slap
if ( e == opm.ora_e )
be_entry_release_w( &opm, opm.ora_e );
}
- opm.o_bd->bd_info = bi;
if ( mod.sml_next != NULL ) {
slap_mods_free( mod.sml_next, 1 );
@@ -1499,23 +1433,6 @@ syncprov_add_slog( Operation *op )
sl = si->si_logs;
{
- if ( BER_BVISEMPTY( &op->o_csn ) ) {
- /* During the syncrepl refresh phase we can receive operations
- * without a csn. We cannot reliably determine the consumers
- * state with respect to such operations, so we ignore them and
- * wipe out anything in the log if we see them.
- */
- ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
- while ( se = sl->sl_head ) {
- sl->sl_head = se->se_next;
- ch_free( se );
- }
- sl->sl_tail = NULL;
- sl->sl_num = 0;
- ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
- return;
- }
-
/* Allocate a record. UUIDs are not NUL-terminated. */
se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +
op->o_csn.bv_len + 1 );
@@ -1534,29 +1451,17 @@ syncprov_add_slog( Operation *op )
ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
if ( sl->sl_head ) {
- /* Keep the list in csn order. */
- if ( ber_bvcmp( &sl->sl_tail->se_csn, &se->se_csn ) <= 0 ) {
- sl->sl_tail->se_next = se;
- sl->sl_tail = se;
- } else {
- slog_entry **sep;
-
- for ( sep = &sl->sl_head; *sep; sep = &(*sep)->se_next ) {
- if ( ber_bvcmp( &se->se_csn, &(*sep)->se_csn ) < 0 ) {
- se->se_next = *sep;
- *sep = se;
- break;
- }
- }
- }
+ sl->sl_tail->se_next = se;
} else {
sl->sl_head = se;
- sl->sl_tail = se;
}
+ sl->sl_tail = se;
sl->sl_num++;
while ( sl->sl_num > sl->sl_size ) {
se = sl->sl_head;
sl->sl_head = se->se_next;
+ strcpy( sl->sl_mincsn.bv_val, se->se_csn.bv_val );
+ sl->sl_mincsn.bv_len = se->se_csn.bv_len;
ch_free( se );
sl->sl_num--;
}
@@ -1768,6 +1673,56 @@ syncprov_op_response( Operation *op, Sla
maxcsn.bv_len = sizeof(cbuf);
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; isml_numvals; i++ ) {
+ sid = slap_parse_csn_sid( &mod->sml_values[i] );
+
+ for ( j=0; jsi_numcsns; j++ ) {
+ if ( sid == si->si_sids[j] ) {
+ if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {
+ ber_bvreplace( &si->si_ctxcsn[j], &mod->sml_values[i] );
+ csn_changed = 1;
+ }
+ break;
+ }
+ }
+
+ if ( j == si->si_numcsns ) {
+ value_add_one( &si->si_ctxcsn, &mod->sml_values[i] );
+ si->si_numcsns++;
+ si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *
+ sizeof(int));
+ si->si_sids[j] = sid;
+ csn_changed = 1;
+ }
+ }
+ 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 );
if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {
/* syncrepl queues the CSN values in the db where
@@ -1807,64 +1762,17 @@ syncprov_op_response( Operation *op, Sla
sizeof(int));
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 */
if ( op->o_dont_replicate ) {
- if ( op->o_tag == LDAP_REQ_MODIFY &&
- op->orm_modlist->sml_op == LDAP_MOD_REPLACE &&
- op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
- /* Catch contextCSN updates from syncrepl. We have to look at
- * all the attribute values, as there may be more than one csn
- * that changed, and only one can be passed in the csn queue.
- */
- Modifications *mod = op->orm_modlist;
- int i, j, sid;
-
- for ( i=0; isml_numvals; i++ ) {
- sid = slap_parse_csn_sid( &mod->sml_values[i] );
- for ( j=0; jsi_numcsns; j++ ) {
- if ( sid == si->si_sids[j] ) {
- if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {
- ber_bvreplace( &si->si_ctxcsn[j], &mod->sml_values[i] );
- csn_changed = 1;
- }
- break;
- }
- }
-
- if ( j == si->si_numcsns ) {
- value_add_one( &si->si_ctxcsn, &mod->sml_values[i] );
- si->si_numcsns++;
- si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *
- sizeof(int));
- si->si_sids[j] = sid;
- csn_changed = 1;
- }
- }
- if ( csn_changed )
- si->si_dirty = 0;
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
-
- if ( csn_changed ) {
- syncops *ss;
- ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
- for ( ss = si->si_ops; ss; ss = ss->s_next ) {
- if ( ss->s_op->o_abandon )
- continue;
- /* Send the updated csn to all syncrepl consumers,
- * including the server from which it originated.
- * The syncrepl consumer and syncprov provider on
- * the originating server may be configured to store
- * their csn values in different entries.
- */
- syncprov_qresp( opc, ss, LDAP_SYNC_NEW_COOKIE );
- }
- ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
- }
- } else {
- ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
- }
goto leave;
}
@@ -1890,7 +1798,6 @@ syncprov_op_response( Operation *op, Sla
}
}
}
- si->si_dirty = !csn_changed;
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
if ( do_check ) {
@@ -2018,7 +1925,6 @@ syncprov_op_mod( Operation *op, SlapRepl
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
have_psearches = ( si->si_ops != NULL );
- si->si_active++;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
cbsize = sizeof(slap_callback) + sizeof(opcookie) +
@@ -2409,7 +2315,6 @@ syncprov_op_search( Operation *op, SlapR
BerVarray ctxcsn;
int i, *sids, numcsns;
struct berval mincsn;
- int dirty = 0;
if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE;
@@ -2454,20 +2359,6 @@ syncprov_op_search( Operation *op, SlapR
sop->s_inuse = 1;
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
- while ( si->si_active ) {
- /* Wait for active mods to finish before proceeding, as they
- * may already have inspected the si_ops list looking for
- * consumers to replicate the change to. Using the log
- * doesn't help, as we may finish playing it before the
- * active mods gets added to it.
- */
- ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
- if ( slapd_shutdown )
- return SLAPD_ABANDON;
- if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
- ldap_pvt_thread_yield();
- ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
- }
sop->s_next = si->si_ops;
si->si_ops = sop;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
@@ -2485,7 +2376,6 @@ syncprov_op_search( Operation *op, SlapR
ctxcsn = NULL;
sids = NULL;
}
- dirty = si->si_dirty;
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
/* If we have a cookie, handle the PRESENT lookups */
@@ -2542,10 +2432,7 @@ syncprov_op_search( Operation *op, SlapR
if ( newer < 0 )
changed = SS_CHANGED;
else if ( newer > 0 ) {
- /* our state is older, complain to consumer */
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- rs->sr_text = "consumer state is newer than provider!";
-bailout:
+ /* our state is older, tell consumer nothing */
if ( sop ) {
syncops **sp = &si->si_ops;
@@ -2556,6 +2443,7 @@ bailout:
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
ch_free( sop );
}
+ rs->sr_err = LDAP_SUCCESS;
rs->sr_ctrls = NULL;
send_ldap_result( op, rs );
return rs->sr_err;
@@ -2565,7 +2453,7 @@ bailout:
if ( changed )
break;
}
- if ( !changed && !dirty ) {
+ if ( !changed ) {
do_present = 0;
no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
LDAPControl *ctrls[2];
@@ -2593,7 +2481,7 @@ no_change: if ( !(op->o_sync_mode & SLA
/* Are there any log entries, and is the consumer state
* present in the session log?
*/
- if ( sl->sl_num > 0 && ber_bvcmp( &mincsn, &sl->sl_head->se_csn ) >= 0 ) {
+ if ( sl->sl_num > 0 && ber_bvcmp( &mincsn, &sl->sl_mincsn ) >= 0 ) {
do_present = 0;
/* mutex is unlocked in playlog */
syncprov_playlog( op, rs, sl, srs, ctxcsn, numcsns, sids );
@@ -2610,9 +2498,8 @@ no_change: if ( !(op->o_sync_mode & SLA
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )
op->o_tmpfree( sids, op->o_tmpmemctx );
- rs->sr_err = LDAP_SYNC_REFRESH_REQUIRED;
- rs->sr_text = "sync cookie is stale";
- goto bailout;
+ send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
+ return rs->sr_err;
}
if ( srs->sr_state.ctxcsn ) {
ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx );
@@ -2632,7 +2519,8 @@ no_change: if ( !(op->o_sync_mode & SLA
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )
op->o_tmpfree( sids, op->o_tmpmemctx );
- goto bailout;
+ send_ldap_result( op, rs );
+ return rs->sr_err;
}
}
} else {
@@ -2649,7 +2537,7 @@ shortcut:
}
/* If something changed, find the changes */
- if ( gotstate && ( changed || dirty ) ) {
+ if ( gotstate && changed ) {
Filter *fand, *fava;
fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );
@@ -2665,14 +2553,10 @@ shortcut:
#endif
ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );
fava->f_next = op->ors_filter;
- if ( sop )
- ldap_pvt_thread_mutex_lock( &sop->s_mutex );
op->ors_filter = fand;
filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
- if ( sop ) {
+ if ( sop )
sop->s_flags |= PS_FIX_FILTER;
- ldap_pvt_thread_mutex_unlock( &sop->s_mutex );
- }
}
/* Let our callback add needed info to returned entries */
@@ -2694,7 +2578,7 @@ shortcut:
* the refresh phase, just invoke the response callback to transition
* us into persist phase
*/
- if ( !changed && !dirty ) {
+ if ( !changed ) {
rs->sr_err = LDAP_SUCCESS;
rs->sr_nentries = 0;
send_ldap_result( op, rs );
@@ -2935,7 +2819,9 @@ sp_cf_gen(ConfigArgs *c)
}
sl = si->si_logs;
if ( !sl ) {
- sl = ch_malloc( sizeof( sessionlog ) );
+ sl = ch_malloc( sizeof( sessionlog ) + LDAP_PVT_CSNSTR_BUFSIZE );
+ sl->sl_mincsn.bv_val = (char *)(sl+1);
+ sl->sl_mincsn.bv_len = 0;
sl->sl_num = 0;
sl->sl_head = sl->sl_tail = NULL;
ldap_pvt_thread_mutex_init( &sl->sl_mutex );
@@ -3152,7 +3038,6 @@ syncprov_db_destroy(
se = se_next;
}
- ldap_pvt_thread_mutex_destroy(&si->si_logs->sl_mutex);
ch_free( si->si_logs );
}
if ( si->si_ctxcsn )