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

ITS#5694 update context's entryCSN during log purges

Browse Source
This commit is contained in:
Howard Chu 2008-09-10 02:29:26 +00:00
parent 4aa9edf03e
commit 2547212e43
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
servers/slapd/overlays/accesslog.c
View File

@ -568,22 +568,21 @@ static int
log_old_lookup( Operation *op, SlapReply *rs ) log_old_lookup( Operation *op, SlapReply *rs )
{ {
purge_data *pd = op->o_callback->sc_private; purge_data *pd = op->o_callback->sc_private;
Attribute *a;
if ( rs->sr_type != REP_SEARCH) return 0; if ( rs->sr_type != REP_SEARCH) return 0;
if ( slapd_shutdown ) return 0; if ( slapd_shutdown ) return 0;
/* Remember old CSN */ /* Remember max CSN: should always be the last entry
if ( pd->csn.bv_val[0] == '\0' ) { * seen, since log entries are ordered chronologically...
Attribute *a = attr_find( rs->sr_entry->e_attrs, */
a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_entryCSN ); slap_schema.si_ad_entryCSN );
if ( a ) { if ( a && ber_bvcmp( &a->a_vals[0], &pd->csn ) > 0 ) {
int len = a->a_vals[0].bv_len; AC_MEMCPY( pd->csn.bv_val, a->a_vals[0].bv_val,
if ( len > pd->csn.bv_len ) a->a_vals[0].bv_len );
len = pd->csn.bv_len; pd->csn.bv_len = a->a_vals[0].bv_len;
AC_MEMCPY( pd->csn.bv_val, a->a_vals[0].bv_val, len );
pd->csn.bv_len = len;
}
} }
if ( pd->used >= pd->slots ) { if ( pd->used >= pd->slots ) {
pd->slots += PURGE_INCREMENT; pd->slots += PURGE_INCREMENT;
@ -656,6 +655,7 @@ accesslog_purge( void *ctx, void *arg )
if ( pd.used ) { if ( pd.used ) {
int i; int i;
/* delete the expired entries */
op->o_tag = LDAP_REQ_DELETE; op->o_tag = LDAP_REQ_DELETE;
op->o_callback = &nullsc; op->o_callback = &nullsc;
op->o_csn = pd.csn; op->o_csn = pd.csn;
@ -670,6 +670,33 @@ accesslog_purge( void *ctx, void *arg )
} }
ch_free( pd.ndn ); ch_free( pd.ndn );
ch_free( pd.dn ); ch_free( pd.dn );
{
Modifications mod;
struct berval bv[2];
/* update context's entryCSN to reflect oldest CSN */
mod.sml_numvals = 1;
mod.sml_values = bv;
bv[0] = pd.csn;
BER_BVZERO(&bv[1]);
mod.sml_nvalues = NULL;
mod.sml_desc = slap_schema.si_ad_entryCSN;
mod.sml_op = LDAP_MOD_REPLACE;
mod.sml_flags = SLAP_MOD_INTERNAL;
mod.sml_next = NULL;
op->o_tag = LDAP_REQ_MODIFY;
op->orm_modlist = &mod;
op->orm_no_opattrs = 1;
op->o_req_dn = li->li_db->be_suffix[0];
op->o_req_ndn = li->li_db->be_nsuffix[0];
op->o_no_schema_check = 1;
op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
op->o_bd->be_modify( op, &rs );
if ( mod.sml_next ) {
slap_mods_free( mod.sml_next, 1 );
}
}
} }
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );