ITS#4567 use unique timestamps for ops for cascading delta-sync

This commit is contained in:
Howard Chu 2006-05-27 10:26:15 +00:00
parent 7a3ff8ddc2
commit 62437022ab

View File

@ -1350,6 +1350,7 @@ syncrepl_message_to_op(
} }
op->o_callback = &cb; op->o_callback = &cb;
slap_op_time( &op->o_time, &op->o_tincr );
switch( op->o_tag ) { switch( op->o_tag ) {
case LDAP_REQ_ADD: case LDAP_REQ_ADD:
@ -1770,6 +1771,7 @@ syncrepl_entry(
} }
} }
slap_op_time( &op->o_time, &op->o_tincr );
switch ( syncstate ) { switch ( syncstate ) {
case LDAP_SYNC_ADD: case LDAP_SYNC_ADD:
case LDAP_SYNC_MODIFY: case LDAP_SYNC_MODIFY:
@ -1848,6 +1850,7 @@ retry_add:;
if ( rc ) goto done; if ( rc ) goto done;
retry = 0; retry = 0;
slap_op_time( &op->o_time, &op->o_tincr );
goto retry_add; goto retry_add;
} }
/* FALLTHRU */ /* FALLTHRU */
@ -1893,6 +1896,8 @@ retry_add:;
} else { } else {
goto done; goto done;
} }
if ( dni.wasChanged )
slap_op_time( &op->o_time, &op->o_tincr );
} }
if ( dni.wasChanged ) { if ( dni.wasChanged ) {
Modifications *mod, *modhead = NULL; Modifications *mod, *modhead = NULL;