mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Really fix ITS#5709 - more explicit check for un-replicatable ops, and

Browse Source 
don't send ctxcsn update if current maxcsn doesn't match current csn
This commit is contained in:
Howard Chu 2008-11-02 15:26:25 +00:00
parent a8658c742e
commit d75a567708
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1604,12 +1604,12 @@ syncprov_op_response( Operation *op, SlapReply *rs )
{
struct berval maxcsn = BER_BVNULL;
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
int do_check = 0, have_psearches;
int do_check = 0, have_psearches, foundit;
/* Update our context CSN */
cbuf[0] = '\0';
ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
slap_get_commit_csn( op, &maxcsn );
slap_get_commit_csn( op, &maxcsn, &foundit );
if ( BER_BVISNULL( &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.
@ -1618,7 +1618,7 @@ syncprov_op_response( Operation *op, SlapReply *rs )
*/
BackendDB *be = op->o_bd;
op->o_bd = select_backend( &be->be_nsuffix[0], 1);
slap_get_commit_csn( op, &maxcsn );
slap_get_commit_csn( op, &maxcsn, &foundit );
op->o_bd = be;
}
if ( !BER_BVISNULL( &maxcsn ) ) {
@ -1641,7 +1641,7 @@ syncprov_op_response( Operation *op, SlapReply *rs )
sizeof(int));
si->si_sids[i] = sid;
}
} else {
} 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;
@ -1678,8 +1678,11 @@ syncprov_op_response( Operation *op, SlapReply *rs )
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
}
opc->sctxcsn.bv_len = maxcsn.bv_len;
opc->sctxcsn.bv_val = cbuf;
/* only update consumer ctx if this is the greatest csn */
if ( bvmatch( &maxcsn, &op->o_csn )) {
opc->sctxcsn.bv_len = maxcsn.bv_len;
opc->sctxcsn.bv_val = cbuf;
}
/* Handle any persistent searches */
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );