mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8365 partially revert ITS#8281

Browse Source 
Must setup psearch before snapshotting ctxcsn
This commit is contained in:
Howard Chu 2016-02-02 19:41:13 +00:00
parent e1da338c78
commit d6f3440d94
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
servers/slapd/overlays/syncprov.c
View File

@ -2492,28 +2492,6 @@ syncprov_op_search( Operation *op, SlapReply *rs )
return rs->sr_err; return rs->sr_err;
} }
/* snapshot the ctxcsn */
ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
numcsns = si->si_numcsns;
if ( numcsns ) {
ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
for ( i=0; i<numcsns; i++ )
sids[i] = si->si_sids[i];
} else {
ctxcsn = NULL;
sids = NULL;
}
dirty = si->si_dirty;
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
/* We know nothing - do nothing */
if ( !numcsns ) {
rs->sr_err = LDAP_SUCCESS;
send_ldap_result( op, rs );
return rs->sr_err;
}
srs = op->o_controls[slap_cids.sc_LDAPsync]; srs = op->o_controls[slap_cids.sc_LDAPsync];
/* If this is a persistent search, set it up right away */ /* If this is a persistent search, set it up right away */
@ -2580,16 +2558,35 @@ syncprov_op_search( Operation *op, SlapReply *rs )
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
} }
/* snapshot the ctxcsn
* Note: this must not be done before the psearch setup. (ITS#8365)
*/
ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
numcsns = si->si_numcsns;
if ( numcsns ) {
ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
for ( i=0; i<numcsns; i++ )
sids[i] = si->si_sids[i];
} else {
ctxcsn = NULL;
sids = NULL;
}
dirty = si->si_dirty;
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
/* If we have a cookie, handle the PRESENT lookups */ /* If we have a cookie, handle the PRESENT lookups */
if ( srs->sr_state.ctxcsn ) { if ( srs->sr_state.ctxcsn ) {
sessionlog *sl; sessionlog *sl;
int i, j; int i, j;
/* If we don't have any CSN of our own yet, pretend nothing /* If we don't have any CSN of our own yet, bail out.
* has changed.
*/ */
if ( !numcsns ) if ( !numcsns ) {
goto no_change; rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "consumer has state info but provider doesn't!";
goto bailout;
}
if ( !si->si_nopres ) if ( !si->si_nopres )
do_present = SS_PRESENT; do_present = SS_PRESENT;
@ -2679,7 +2676,7 @@ bailout:
/* If nothing has changed, shortcut it */ /* If nothing has changed, shortcut it */
if ( !changed && !dirty ) { if ( !changed && !dirty ) {
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];
ctrls[0] = NULL; ctrls[0] = NULL;
@ -2766,6 +2763,9 @@ no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
} }
} }
} else { } else {
/* The consumer knows nothing, we know nothing. OK. */
if (!numcsns)
goto no_change;
/* No consumer state, assume something has changed */ /* No consumer state, assume something has changed */
changed = SS_CHANGED; changed = SS_CHANGED;
} }