ITS#8281 fix delta-mmr with interrupted refresh

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

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index d2da4c718133228053e2bf4bbcccd82d5812f1af..69be484165452ff6d7e4b4491188250ab1ef277c 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1915,10 +1915,13 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                        } else {
                        ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
                        }
+                       if ( csn_changed )
+                               si->si_numops++;
                        goto leave;
                }
 
-               si->si_numops++;
+               if ( csn_changed )
+                       si->si_numops++;
                if ( si->si_chkops || si->si_chktime ) {
                        /* Never checkpoint adding the context entry,
                         * it will deadlock
@@ -2489,6 +2492,28 @@ syncprov_op_search( Operation *op, SlapReply *rs )
                return rs->sr_err;
        }
 
+       /* snapshot the ctxcsn */
+       ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
+       numcsns = si->si_numcsns;
+       if ( numcsns ) {
+               ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
+               sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
+               for ( i=0; i<numcsns; i++ )
+                       sids[i] = si->si_sids[i];
+       } else {
+               ctxcsn = NULL;
+               sids = NULL;
+       }
+       dirty = si->si_dirty;
+       ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
+
+       /* We know nothing - do nothing */
+       if ( !numcsns ) {
+               rs->sr_err = LDAP_SUCCESS;
+               send_ldap_result( op, rs );
+               return rs->sr_err;
+       }
+
        srs = op->o_controls[slap_cids.sc_LDAPsync];
 
        /* If this is a persistent search, set it up right away */
@@ -2550,21 +2575,6 @@ syncprov_op_search( Operation *op, SlapReply *rs )
                ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
        }
 
-       /* snapshot the ctxcsn */
-       ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
-       numcsns = si->si_numcsns;
-       if ( numcsns ) {
-               ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
-               sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
-               for ( i=0; i<numcsns; i++ )
-                       sids[i] = si->si_sids[i];
-       } else {
-               ctxcsn = NULL;
-               sids = NULL;
-       }
-       dirty = si->si_dirty;
-       ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
-       
        /* If we have a cookie, handle the PRESENT lookups */
        if ( srs->sr_state.ctxcsn ) {
                sessionlog *sl;
@@ -3155,7 +3165,7 @@ syncprov_db_open(
                char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
                struct berval csn;
 
-               if ( SLAP_SYNC_SHADOW( op->o_bd )) {
+               if ( slap_serverID || SLAP_SYNC_SHADOW( op->o_bd )) {
                /* If we're also a consumer, then don't generate anything.
                 * Wait for our provider to send it to us, or for a local
                 * modify if we have multimaster.