ITS#5973 re-enable patch

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

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 8e9fae5a403ea849b5438387828013debe8466c9..2fb23d3c3cdb2337570503525751575163908da2 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -142,6 +142,7 @@ typedef struct syncprov_info_t {
 typedef struct opcookie {
        slap_overinst *son;
        syncmatches *smatches;
+       modtarget *smt;
        struct berval sdn;      /* DN of entry, for deletes */
        struct berval sndn;
        struct berval suuid;    /* UUID of entry */
@@ -1313,26 +1314,24 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
        }
 
        /* Remove op from lock table */
-       mtdummy.mt_op = op;
-       ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
-       mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
+       mt = opc->smt;
        if ( mt ) {
                modinst *mi = mt->mt_mods;
 
                /* If there are more, promote the next one */
-               ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
                if ( mi->mi_next ) {
+                       ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
                        mt->mt_mods = mi->mi_next;
                        mt->mt_op = mt->mt_mods->mi_op;
                        ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
                } else {
+                       ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
                        avl_delete( &si->si_mods, mt, sp_avl_cmp );
-                       ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
+                       ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
                        ldap_pvt_thread_mutex_destroy( &mt->mt_mutex );
                        ch_free( mt );
                }
        }
-       ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
        if ( !BER_BVISNULL( &opc->suuid ))
                op->o_tmpfree( opc->suuid.bv_val, op->o_tmpmemctx );
        if ( !BER_BVISNULL( &opc->sndn ))
@@ -1645,7 +1644,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                maxcsn.bv_len = sizeof(cbuf);
                ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
 
-#if 0
                if ( op->o_dont_replicate &&
                                op->orm_modlist->sml_op == LDAP_MOD_REPLACE &&
                                op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
@@ -1695,7 +1693,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                        }
                        return SLAP_CB_CONTINUE;
                }
-#endif
 
                slap_get_commit_csn( op, &maxcsn, &foundit );
                if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {
@@ -1944,6 +1941,9 @@ syncprov_op_mod( Operation *op, SlapReply *rs )
                                 * Currently it's not an issue because there are
                                 * no dynamic config deletes...
                                 */
+                               if ( slapd_shutdown )
+                                       return SLAPD_ABANDON;
+
                                if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
                                        ldap_pvt_thread_yield();
                                ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
@@ -1971,6 +1971,7 @@ syncprov_op_mod( Operation *op, SlapReply *rs )
                        avl_insert( &si->si_mods, mt, sp_avl_cmp, avl_dup_error );
                        ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
                }
+               opc->smt = mt;
        }
 
        if (( have_psearches || si->si_logs ) && op->o_tag != LDAP_REQ_ADD )
@@ -2374,13 +2375,32 @@ syncprov_op_search( Operation *op, SlapReply *rs )
 
                /* If nothing has changed, shortcut it */
                if ( srs->sr_state.numcsns == numcsns ) {
-                       int i, j;
+                       int i, j, newer;
                        for ( i=0; i<srs->sr_state.numcsns; i++ ) {
                                for ( j=0; j<numcsns; j++ ) {
                                        if ( srs->sr_state.sids[i] != sids[j] )
                                                continue;
-                                       if ( !bvmatch( &srs->sr_state.ctxcsn[i], &ctxcsn[j] ))
+                                       newer = ber_bvcmp( &srs->sr_state.ctxcsn[i], &ctxcsn[j] );
+                                       /* If our state is newer, tell consumer about changes */
+                                       if ( newer < 0 )
                                                changed = SS_CHANGED;
+                                       else if ( newer > 0 ) {
+                                       /* our state is older, tell consumer nothing */
+                                               if ( sop ) {
+                                                       syncops **sp = &si->si_ops;
+                                                       
+                                                       ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
+                                                       while ( *sp != sop )
+                                                               sp = &(*sp)->s_next;
+                                                       *sp = sop->s_next;
+                                                       ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
+                                                       ch_free( sop );
+                                               }
+                                               rs->sr_err = LDAP_SUCCESS;
+                                               rs->sr_ctrls = NULL;
+                                               send_ldap_result( op, rs );
+                                               return rs->sr_err;
+                                       }
                                        break;
                                }
                                if ( changed )