ITS#8281 more for prev commit

[openldap] / servers / slapd / overlays / accesslog.c

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 0e3d8d88ca6a19b4f615d6ea1ef88081c1807bff..e708794047a16926ab09703dd36a095b6380e969 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2014 The OpenLDAP Foundation.
+ * Copyright 2005-2015 The OpenLDAP Foundation.
  * Portions copyright 2004-2005 Symas Corporation.
  * All rights reserved.
  *
@@ -1490,9 +1490,17 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        if ( lo->mask & LOG_OP_WRITES ) {
                slap_callback *cb;
 
-               /* These internal ops are not logged */
-               if ( op->o_dont_replicate && op->orm_no_opattrs )
+               /* Most internal ops are not logged */
+               if ( op->o_dont_replicate) {
+                       /* Let contextCSN updates from syncrepl thru; the underlying
+                        * syncprov needs to see them. Skip others.
+                        */
+                       if (( op->o_tag != LDAP_REQ_MODIFY ||
+                               op->orm_modlist->sml_op != LDAP_MOD_REPLACE ||
+                               op->orm_modlist->sml_desc != slap_schema.si_ad_contextCSN ) &&
+                               op->orm_no_opattrs )
                        return SLAP_CB_CONTINUE;
+               }
 
                ldap_pvt_thread_mutex_lock( &li->li_log_mutex );
                old = li->li_old;
@@ -1509,6 +1517,11 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                ldap_pvt_thread_rmutex_unlock( &li->li_op_rmutex, op->o_tid );
        }
 
+       /* ignore these internal reads */
+       if (( lo->mask & LOG_OP_READS ) && op->o_do_not_cache ) {
+               return SLAP_CB_CONTINUE;
+       }
+
        if ( li->li_success && rs->sr_err != LDAP_SUCCESS )
                goto done;
 
@@ -1518,7 +1531,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
 
        if ( rs->sr_text ) {
                ber_str2bv( rs->sr_text, 0, 0, &bv );
-               attr_merge_one( e, ad_reqMessage, &bv, NULL );
+               attr_merge_normalize_one( e, ad_reqMessage, &bv, op->o_tmpmemctx );
        }
        bv.bv_len = snprintf( timebuf, sizeof( timebuf ), "%d", rs->sr_err );
        if ( bv.bv_len < sizeof( timebuf ) ) {
@@ -1727,7 +1740,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                        (struct berval *)&slap_true_bv : (struct berval *)&slap_false_bv,
                        NULL );
                if ( !BER_BVISEMPTY( &op->ors_filterstr ))
-                       attr_merge_one( e, ad_reqFilter, &op->ors_filterstr, NULL );
+                       attr_merge_normalize_one( e, ad_reqFilter, &op->ors_filterstr, op->o_tmpmemctx );
                if ( op->ors_attrs ) {
                        int j;
                        /* count them */
@@ -1742,7 +1755,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                }
                        }
                        BER_BVZERO(&vals[j]);
-                       attr_merge( e, ad_reqAttr, vals, NULL );
+                       attr_merge_normalize( e, ad_reqAttr, vals, op->o_tmpmemctx );
                        op->o_tmpfree( vals, op->o_tmpmemctx );
                }
                bv.bv_val = timebuf;
@@ -1769,7 +1782,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                        attr_merge_one( e, ad_reqVersion, &bv, NULL );
                } /* else? */
                if ( op->orb_method == LDAP_AUTH_SIMPLE ) {
-                       attr_merge_one( e, ad_reqMethod, &simple, NULL );
+                       attr_merge_normalize_one( e, ad_reqMethod, &simple, op->o_tmpmemctx );
                } else {
                        bv.bv_len = STRLENOF("SASL()") + op->orb_mech.bv_len;
                        bv.bv_val = op->o_tmpalloc( bv.bv_len + 1, op->o_tmpmemctx );
@@ -1777,7 +1790,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                        ptr = lutil_strcopy( ptr, op->orb_mech.bv_val );
                        *ptr++ = ')';
                        *ptr = '\0';
-                       attr_merge_one( e, ad_reqMethod, &bv, NULL );
+                       attr_merge_normalize_one( e, ad_reqMethod, &bv, op->o_tmpmemctx );
                        op->o_tmpfree( bv.bv_val, op->o_tmpmemctx );
                }
 
@@ -1826,10 +1839,29 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        op2.o_req_ndn = e->e_nname;
        op2.ora_e = e;
        op2.o_callback = &nullsc;
+       op2.o_csn = op->o_csn;
+       /* contextCSN updates may still reach here */
+       op2.o_dont_replicate = op->o_dont_replicate;
 
        if (( lo->mask & LOG_OP_WRITES ) && !BER_BVISEMPTY( &op->o_csn )) {
-               slap_queue_csn( &op2, &op->o_csn );
-               do_graduate = 1;
+               struct berval maxcsn;
+               char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
+               int foundit;
+               cbuf[0] = '\0';
+               maxcsn.bv_val = cbuf;
+               maxcsn.bv_len = sizeof(cbuf);
+               /* If there was a commit CSN on the main DB,
+                * we must propagate it to the log DB for its
+                * own syncprov. Otherwise, don't generate one.
+                */
+               slap_get_commit_csn( op, &maxcsn, &foundit );
+               if ( !BER_BVISEMPTY( &maxcsn ) ) {
+                       slap_queue_csn( &op2, &op->o_csn );
+                       do_graduate = 1;
+               } else {
+                       attr_merge_normalize_one( e, slap_schema.si_ad_entryCSN,
+                               &op->o_csn, op->o_tmpmemctx );
+               }
        }
 
        op2.o_bd->be_add( &op2, &rs2 );
@@ -1837,8 +1869,6 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        e = NULL;
        if ( do_graduate ) {
                slap_graduate_commit_csn( &op2 );
-               if ( op2.o_csn.bv_val )
-                       op->o_tmpfree( op2.o_csn.bv_val, op->o_tmpmemctx );
        }
 
 done:
@@ -1917,8 +1947,18 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
        int doit = 0;
 
        /* These internal ops are not logged */
-       if ( op->o_dont_replicate && op->orm_no_opattrs )
+       if ( op->o_dont_replicate ) {
+               /* Let contextCSN updates from syncrepl thru; the underlying
+                * syncprov needs to see them. Skip others.
+                */
+               if (( op->o_tag != LDAP_REQ_MODIFY ||
+                       op->orm_modlist->sml_op != LDAP_MOD_REPLACE ||
+                       op->orm_modlist->sml_desc != slap_schema.si_ad_contextCSN ) &&
+                       op->orm_no_opattrs )
                return SLAP_CB_CONTINUE;
+               /* give this a unique timestamp */
+               op->o_tincr++;
+       }
 
        logop = accesslog_op2logop( op );
        lo = logops+logop+EN_OFFSET;