mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
ITS#5973 use the modify op to pass csn updates from syncrepl to syncprov
This commit is contained in:
parent
0157ae4744
commit
47011649f7
@ -1658,6 +1658,57 @@ syncprov_op_response( Operation *op, SlapReply *rs )
|
|||||||
maxcsn.bv_val = cbuf;
|
maxcsn.bv_val = cbuf;
|
||||||
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->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 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return SLAP_CB_CONTINUE;
|
||||||
|
}
|
||||||
|
|
||||||
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
|
||||||
|
@ -2887,12 +2887,11 @@ syncrepl_updateCookie(
|
|||||||
{
|
{
|
||||||
Backend *be = op->o_bd;
|
Backend *be = op->o_bd;
|
||||||
Modifications mod;
|
Modifications mod;
|
||||||
struct berval first = BER_BVNULL;
|
|
||||||
#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;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int rc, i, j;
|
int rc, i, j, csn_changed = 0;
|
||||||
ber_len_t len;
|
ber_len_t len;
|
||||||
|
|
||||||
slap_callback cb = { NULL };
|
slap_callback cb = { NULL };
|
||||||
@ -2934,13 +2933,7 @@ syncrepl_updateCookie(
|
|||||||
if ( memcmp( syncCookie->ctxcsn[i].bv_val,
|
if ( memcmp( syncCookie->ctxcsn[i].bv_val,
|
||||||
si->si_cookieState->cs_vals[j].bv_val, len ) > 0 ) {
|
si->si_cookieState->cs_vals[j].bv_val, len ) > 0 ) {
|
||||||
mod.sml_values[j] = syncCookie->ctxcsn[i];
|
mod.sml_values[j] = syncCookie->ctxcsn[i];
|
||||||
if ( BER_BVISNULL( &first ) ) {
|
csn_changed = 1;
|
||||||
first = syncCookie->ctxcsn[i];
|
|
||||||
|
|
||||||
} else if ( memcmp( syncCookie->ctxcsn[i].bv_val, first.bv_val, first.bv_len ) > 0 )
|
|
||||||
{
|
|
||||||
first = syncCookie->ctxcsn[i];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -2950,23 +2943,16 @@ syncrepl_updateCookie(
|
|||||||
( mod.sml_numvals+2 )*sizeof(struct berval), op->o_tmpmemctx );
|
( mod.sml_numvals+2 )*sizeof(struct berval), op->o_tmpmemctx );
|
||||||
mod.sml_values[mod.sml_numvals++] = syncCookie->ctxcsn[i];
|
mod.sml_values[mod.sml_numvals++] = syncCookie->ctxcsn[i];
|
||||||
BER_BVZERO( &mod.sml_values[mod.sml_numvals] );
|
BER_BVZERO( &mod.sml_values[mod.sml_numvals] );
|
||||||
if ( BER_BVISNULL( &first ) ) {
|
csn_changed = 1;
|
||||||
first = syncCookie->ctxcsn[i];
|
|
||||||
} else if ( memcmp( syncCookie->ctxcsn[i].bv_val, first.bv_val, first.bv_len ) > 0 )
|
|
||||||
{
|
|
||||||
first = syncCookie->ctxcsn[i];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Should never happen, ITS#5065 */
|
/* Should never happen, ITS#5065 */
|
||||||
if ( BER_BVISNULL( &first )) {
|
if ( !csn_changed ) {
|
||||||
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
|
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
|
||||||
op->o_tmpfree( mod.sml_values, op->o_tmpmemctx );
|
op->o_tmpfree( mod.sml_values, op->o_tmpmemctx );
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
op->o_bd = si->si_wbe;
|
op->o_bd = si->si_wbe;
|
||||||
slap_queue_csn( op, &first );
|
|
||||||
|
|
||||||
op->o_tag = LDAP_REQ_MODIFY;
|
op->o_tag = LDAP_REQ_MODIFY;
|
||||||
|
|
||||||
cb.sc_response = null_callback;
|
cb.sc_response = null_callback;
|
||||||
|
Loading…
Reference in New Issue
Block a user