Patch: Delete the buggy surrogate parent code (ITS#1815)

[openldap] / servers / slapd / back-bdb / modify.c

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index d3fde84883d9ce42989e7bfaad5f27228c80a9c2..965bb0b0980dc13d514741dd9d355f3062397343 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -32,7 +32,8 @@ int bdb_modify_internal(
        Attribute       *ap;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY,"bdb_modify_internal: 0x%08lx: %s\n", e->e_id, e->e_dn ));
+       LDAP_LOG ( OPERATION, ENTRY, "bdb_modify_internal: 0x%08lx: %s\n", 
+               e->e_id, e->e_dn, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
                e->e_id, e->e_dn, 0);
@@ -51,14 +52,15 @@ int bdb_modify_internal(
                switch ( mod->sm_op ) {
                case LDAP_MOD_ADD:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: add\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify_internal: add\n", 0,0,0);
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
 #endif
                        err = modify_add_values( e, mod, text, textbuf, textlen );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: %d %s\n", err, *text, 0 );
 #else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -68,7 +70,8 @@ int bdb_modify_internal(
 
                case LDAP_MOD_DELETE:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: delete\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "bdb_modify_internal: delete\n", 0, 0, 0 );
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
 #endif
@@ -76,7 +79,8 @@ int bdb_modify_internal(
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: %d %s\n", err, *text, 0 );
 #else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -86,15 +90,16 @@ int bdb_modify_internal(
 
                case LDAP_MOD_REPLACE:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: replace\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "bdb_modify_internal: replace\n", 0, 0, 0 );
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
 #endif
                        err = modify_replace_values( e, mod, text, textbuf, textlen );
-                       assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: %d %s\n", err, *text, 0 );
 #else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -104,7 +109,8 @@ int bdb_modify_internal(
 
                case SLAP_MOD_SOFTADD:
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: softadd\n" ));
+                       LDAP_LOG ( OPERATION, DETAIL1, 
+                               "bdb_modify_internal: softadd\n",0,0,0 );
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: softadd\n", 0, 0, 0);
 #endif
@@ -120,7 +126,8 @@ int bdb_modify_internal(
 
                        if( err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: %d %s\n", err, *text, 0 );
 #else
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -130,7 +137,8 @@ int bdb_modify_internal(
 
                default:
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: invalid op %d\n", mod->sm_op ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: invalid op %d\n", mod->sm_op, 0, 0 );
 #else
                        Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
                                mod->sm_op, 0, 0);
@@ -138,7 +146,8 @@ int bdb_modify_internal(
                        *text = "Invalid modify operation";
                        err = LDAP_OTHER;
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: %d %s\n", err, *text, 0 );
 #else
                        Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                err, *text, 0);
@@ -157,9 +166,10 @@ int bdb_modify_internal(
                        e->e_ocflags = 0;
                }
 
-               /* check if modified attribute was indexed */
+               /* check if modified attribute was indexed
+                * but not in case of NOOP... */
                err = bdb_index_is_indexed( be, mod->sm_desc );
-               if ( err == LDAP_SUCCESS ) {
+               if ( err == LDAP_SUCCESS && !op->o_noop ) {
                        ap = attr_find( save_attrs, mod->sm_desc );
                        if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
 
@@ -170,15 +180,23 @@ int bdb_modify_internal(
 
        /* check that the entry still obeys the schema */
        rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
-       if ( rc != LDAP_SUCCESS ) {
+       if ( rc != LDAP_SUCCESS || op->o_noop ) {
                attrs_free( e->e_attrs );
                e->e_attrs = save_attrs;
+
+               if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: entry failed schema check %s\n", *text ));
+                       LDAP_LOG ( OPERATION, ERR, "bdb_modify_internal: "
+                               "entry failed schema check %s\n", 
+                               *text, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
-                       *text, 0, 0 );
+                       Debug( LDAP_DEBUG_ANY,
+                               "entry failed schema check: %s\n",
+                               *text, 0, 0 );
 #endif
+               }
+
+               /* if NOOP then silently revert to saved attrs */
                return rc;
        }
 
@@ -193,7 +211,9 @@ int bdb_modify_internal(
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index delete failure\n" ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: attribute index delete failure\n",
+                                       0, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                       "Attribute index delete failure",
@@ -214,7 +234,9 @@ int bdb_modify_internal(
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
 #ifdef NEW_LOGGING
-                               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index add failure\n" ));
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "bdb_modify_internal: attribute index add failure\n", 
+                                       0, 0, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                       "Attribute index add failure",
@@ -241,8 +263,8 @@ bdb_modify(
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        int rc;
-       Entry           *matched;
-       Entry           *e;
+       Entry           *matched = NULL;
+       Entry           *e = NULL;
        int             manageDSAit = get_manageDSAit( op );
        const char *text = NULL;
        char textbuf[SLAP_TEXT_BUFLEN];
@@ -250,8 +272,13 @@ bdb_modify(
        DB_TXN  *ltid = NULL;
        struct bdb_op_info opinfo;
 
+       u_int32_t       locker;
+       DB_LOCK         lock;
+
+       int             noop = 0;
+
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "bdb_modify: %s\n", dn->bv_val ));
+       LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
 #endif
@@ -260,10 +287,10 @@ bdb_modify(
 retry: /* transaction retry */
                if( e != NULL ) {
                        bdb_cache_delete_entry(&bdb->bi_cache, e);
-                       bdb_cache_return_entry_w(&bdb->bi_cache, e);
+                       bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: retrying...\n" ));
+               LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
 #else
                Debug(LDAP_DEBUG_TRACE,
                        "bdb_modify: retrying...\n", 0, 0, 0);
@@ -285,7 +312,8 @@ retry:      /* transaction retry */
        text = NULL;
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_begin failed: %s (%d)\n",
@@ -296,17 +324,20 @@ retry:    /* transaction retry */
                goto return_results;
        }
 
+       locker = TXN_ID ( ltid );
+
        opinfo.boi_bdb = be;
        opinfo.boi_txn = ltid;
        opinfo.boi_err = 0;
        op->o_private = &opinfo;
 
        /* get entry */
-       rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0 );
+       rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0, locker, &lock );
 
        if ( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: dn2entry failed: (%d)\n", rc ));
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_modify: dn2entry failed: (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: dn2entry failed (%d)\n",
@@ -318,6 +349,9 @@ retry:      /* transaction retry */
                        goto retry;
                case DB_NOTFOUND:
                        break;
+               case LDAP_BUSY:
+                       text = "ldap server busy";
+                       goto return_results;
                default:
                        rc = LDAP_OTHER;
                }
@@ -335,7 +369,7 @@ retry:      /* transaction retry */
                        refs = is_entry_referral( matched )
                                ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
-                       bdb_cache_return_entry_r (&bdb->bi_cache, matched);
+                       bdb_unlocked_cache_return_entry_r (&bdb->bi_cache, matched);
                        matched = NULL;
 
                } else {
@@ -349,7 +383,7 @@ retry:      /* transaction retry */
                ber_bvarray_free( refs );
                free( matched_dn );
 
-               return rc;
+               goto done;
        }
 
        if ( !manageDSAit && is_entry_referral( e ) ) {
@@ -358,7 +392,7 @@ retry:      /* transaction retry */
                        conn, op, e );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: entry is referral\n" ));
+               LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: entry is referral\n",
@@ -378,7 +412,8 @@ retry:      /* transaction retry */
 
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: modify failed (%d)\n", rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_modify: modify failed (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: modify failed (%d)\n",
@@ -396,7 +431,8 @@ retry:      /* transaction retry */
        rc = bdb_id2entry_update( be, ltid, e );
        if ( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: id2entry update failed (%d)\n", rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_modify: id2entry update failed (%d)\n", rc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: id2entry update failed (%d)\n",
@@ -412,7 +448,12 @@ retry:     /* transaction retry */
        }
 
        if( op->o_noop ) {
-               rc = TXN_ABORT( ltid );
+               if ( ( rc = TXN_ABORT( ltid ) ) != 0 ) {
+                       text = "txn_abort (no-op) failed";
+               } else {
+                       noop = 1;
+                       rc = LDAP_SUCCESS;
+               }
        } else {
                rc = TXN_COMMIT( ltid, 0 );
        }
@@ -421,7 +462,9 @@ retry:      /* transaction retry */
 
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: txn_%s failed %s (%d)\n", op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc ));
+               LDAP_LOG ( OPERATION, ERR, 
+                       "bdb_modify: txn_%s failed %s (%d)\n", 
+                       op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: txn_%s failed: %s (%d)\n",
@@ -433,7 +476,9 @@ retry:      /* transaction retry */
 
        } else {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: updated%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn ));
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_modify: updated%s id=%08lx dn=\"%s\"\n", 
+                       op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_modify: updated%s id=%08lx dn=\"%s\"\n",
@@ -461,7 +506,7 @@ done:
        }
 
        if( e != NULL ) {
-               bdb_cache_return_entry_w (&bdb->bi_cache, e);
+               bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
        }
-       return rc;
+       return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
 }