ITS#8527 - Add additional debug logging on consumer/provider state when the consumer...

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

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 2f0f5e8fee4248f5ffba80d3689e95bb7dbd53b8..72c9064ba35a9f15a5c40f31cc6d8cc5c5bbe501 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -28,7 +28,9 @@
 #include "config.h"
 #include "ldap_rq.h"
 
+#ifdef LDAP_DEVEL
 #define        CHECK_CSN       1
+#endif
 
 /* A modify request on a particular entry */
 typedef struct modinst {
@@ -915,7 +917,6 @@ syncprov_qstart( syncops *so );
 static int
 syncprov_qplay( Operation *op, syncops *so )
 {
-       slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
        syncres *sr;
        int rc = 0;
 
@@ -1013,7 +1014,7 @@ syncprov_qstart( syncops *so )
 {
        so->s_flags |= PS_TASK_QUEUED;
        so->s_inuse++;
-       ldap_pvt_thread_pool_submit( &connection_pool, 
+       ldap_pvt_thread_pool_submit( &connection_pool,
                syncprov_qtask, so );
 }
 
@@ -1549,7 +1550,7 @@ syncprov_add_slog( Operation *op )
                }
 
                /* Allocate a record. UUIDs are not NUL-terminated. */
-               se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len + 
+               se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +
                        op->o_csn.bv_len + 1 );
                se->se_next = NULL;
                se->se_tag = op->o_tag;
@@ -1595,7 +1596,7 @@ syncprov_add_slog( Operation *op )
                }
                sl->sl_num++;
                while ( sl->sl_num > sl->sl_size ) {
-                       int i, j;
+                       int i;
                        se = sl->sl_head;
                        sl->sl_head = se->se_next;
                        for ( i=0; i<sl->sl_numcsns; i++ )
@@ -2435,7 +2436,7 @@ syncprov_search_response( Operation *op, SlapReply *rs )
                } else {
                /* It's RefreshAndPersist, transition to Persist phase */
                        syncprov_sendinfo( op, rs, ( ss->ss_flags & SS_PRESENT ) ?
-                               LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
+                               LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
                                ( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL,
                                1, NULL, 0 );
                        if ( !BER_BVISNULL( &cookie ))
@@ -2655,6 +2656,10 @@ syncprov_op_search( Operation *op, SlapReply *rs )
                        /* our state is older, complain to consumer */
                                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                                rs->sr_text = "consumer state is newer than provider!";
+                               Log4( LDAP_DEBUG_SYNC, ldap_syslog_level,
+                                       "consumer %d state %s is newer than provider %d state %s\n",
+                                       sids[i], srs->sr_state.ctxcsn[i].bv_val, sids[j], /* == slap_serverID */
+                                       ctxcsn[j].bv_val);
 bailout:
                                if ( sop ) {
                                        syncops **sp = &si->si_ops;
@@ -2670,7 +2675,7 @@ bailout:
                                send_ldap_result( op, rs );
                                return rs->sr_err;
                        }
-               }
+               }
                if ( BER_BVISEMPTY( &mincsn )) {
                        mincsn = maxcsn;
                        minsid = maxsid;
@@ -3216,8 +3221,8 @@ syncprov_db_close(
        ConfigReply *cr
 )
 {
-    slap_overinst   *on = (slap_overinst *) be->bd_info;
-    syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
+       slap_overinst   *on = (slap_overinst *) be->bd_info;
+       syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
 #ifdef SLAP_CONFIG_DELETE
        syncops *so, *sonext;
 #endif /* SLAP_CONFIG_DELETE */
@@ -3256,7 +3261,7 @@ syncprov_db_close(
        overlay_unregister_control( be, LDAP_CONTROL_SYNC );
 #endif /* SLAP_CONFIG_DELETE */
 
-    return 0;
+       return 0;
 }
 
 static int