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 25637302f1efd23219cd003d7abc266d329e91cc..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;
 
@@ -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++ )
@@ -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;