]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/add.c
Import ITS#4439 (slapd not responding) fix for BDB/HDB cache from HEAD
[openldap] / servers / slapd / back-bdb / add.c
index 6be4202c70000cf2ae421ce33fb772278c3f5b80..cd37908a20a8f29e479e798f8d1af21a60d3884a 100644 (file)
@@ -1,8 +1,17 @@
 /* add.c - ldap BerkeleyDB back-end add routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 #include <ac/string.h>
 
 #include "back-bdb.h"
-#include "external.h"
 
 int
-bdb_add(
-       BackendDB       *be,
-       Connection      *conn,
-       Operation       *op,
-       Entry   *e )
+bdb_add(Operation *op, SlapReply *rs )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        struct berval   pdn;
        Entry           *p = NULL;
-       int                     rc; 
-       const char      *text;
+       EntryInfo       *ei;
        char textbuf[SLAP_TEXT_BUFLEN];
        size_t textlen = sizeof textbuf;
        AttributeDescription *children = slap_schema.si_ad_children;
-       DB_TXN          *ltid = NULL;
-       struct bdb_op_info opinfo;
+       AttributeDescription *entry = slap_schema.si_ad_entry;
+       DB_TXN          *ltid = NULL, *lt2;
+       struct bdb_op_info opinfo = {0};
        int subentry;
+       u_int32_t       locker = 0;
+       DB_LOCK         lock;
 
-       Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
+       int             num_retries = 0;
+
+       LDAPControl **postread_ctrl = NULL;
+       LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
+       int num_ctrls = 0;
+
+       Debug(LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_add) ": %s\n",
+               op->oq_add.rs_e->e_name.bv_val, 0, 0);
+
+       ctrls[num_ctrls] = 0;
+
+       /* add opattrs to shadow as well, only missing attrs will actually
+        * be added; helps compatibility with older OL versions */
+       slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
 
        /* check entry's schema */
-       rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
-       if ( rc != LDAP_SUCCESS ) {
+       rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
+               get_manageDIT(op), &rs->sr_text, textbuf, textlen );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: entry failed schema check: %s (%d)\n",
-                       text, rc, 0 );
+                       LDAP_XSTRING(bdb_add) ": entry failed schema check: "
+                       "%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
                goto return_results;
        }
 
-       subentry = is_entry_subentry( e );
+       subentry = is_entry_subentry( op->oq_add.rs_e );
 
        /*
         * acquire an ID outside of the operation transaction
         * to avoid serializing adds.
         */
-       rc = bdb_next_id( be, NULL, &e->e_id );
-       if( rc != 0 ) {
+       rs->sr_err = bdb_next_id( op->o_bd, NULL, &op->oq_add.rs_e->e_id );
+       if( rs->sr_err != 0 ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: next_id failed (%d)\n",
-                       rc, 0, 0 );
-               rc = LDAP_OTHER;
-               text = "internal error";
+                       LDAP_XSTRING(bdb_add) ": next_id failed (%d)\n",
+                       rs->sr_err, 0, 0 );
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
                goto return_results;
        }
 
        if( 0 ) {
-               /* transaction retry */
-retry: rc = txn_abort( ltid );
+retry: /* transaction retry */
+               if( p ) {
+                       /* free parent and reader lock */
+                       bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+                       p = NULL;
+               }
+               rs->sr_err = TXN_ABORT( ltid );
                ltid = NULL;
                op->o_private = NULL;
-               if( rc != 0 ) {
-                       rc = LDAP_OTHER;
-                       text = "internal error";
+               op->o_do_not_cache = opinfo.boi_acl_cache;
+               if( rs->sr_err != 0 ) {
+                       rs->sr_err = LDAP_OTHER;
+                       rs->sr_text = "internal error";
+                       goto return_results;
+               }
+               if ( op->o_abandon ) {
+                       rs->sr_err = SLAPD_ABANDON;
                        goto return_results;
                }
+               bdb_trans_backoff( ++num_retries );
        }
 
        /* begin transaction */
-       if( bdb->bi_txn ) {
-               rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
-                       bdb->bi_db_opflags );
-               text = NULL;
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_add: txn_begin failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-                       rc = LDAP_OTHER;
-                       text = "internal error";
-                       goto return_results;
-               }
+       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+               bdb->bi_db_opflags );
+       rs->sr_text = NULL;
+       if( rs->sr_err != 0 ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": txn_begin failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
+               goto return_results;
        }
 
-       opinfo.boi_bdb = be;
+       locker = TXN_ID ( ltid );
+
+       opinfo.boi_bdb = op->o_bd;
        opinfo.boi_txn = ltid;
+       opinfo.boi_locker = locker;
        opinfo.boi_err = 0;
+       opinfo.boi_acl_cache = op->o_do_not_cache;
        op->o_private = &opinfo;
        
        /*
         * Get the parent dn and see if the corresponding entry exists.
-        * If the parent does not exist, only allow the "root" user to
-        * add the entry.
         */
-       pdn.bv_val = dn_parent( be, e->e_ndn );
-       if (pdn.bv_val && *pdn.bv_val) {
-               pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
+       if ( be_issuffix( op->o_bd, &op->oq_add.rs_e->e_nname ) ) {
+               pdn = slap_empty_bv;
        } else {
-               pdn.bv_len = 0;
+               dnParent( &op->oq_add.rs_e->e_nname, &pdn );
        }
 
-       if( pdn.bv_len != 0 ) {
-               Entry *matched = NULL;
+       /* get entry or parent */
+       rs->sr_err = bdb_dn2entry( op, ltid, &op->ora_e->e_nname, &ei,
+               1, locker, &lock );
+       switch( rs->sr_err ) {
+       case 0:
+               rs->sr_err = LDAP_ALREADY_EXISTS;
+               goto return_results;
+       case DB_NOTFOUND:
+               break;
+       case DB_LOCK_DEADLOCK:
+       case DB_LOCK_NOTGRANTED:
+               goto retry;
+       case LDAP_BUSY:
+               rs->sr_text = "ldap server busy";
+               goto return_results;
+       default:
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
+               goto return_results;
+       }
 
-               /* get parent */
-               rc = bdb_dn2entry( be, ltid, &pdn, &p, &matched, 0 );
+       p = ei->bei_e;
+       if ( p ) {
+               if ( !bvmatch( &pdn, &p->e_nname ) ) {
+                       rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
+                               op->o_tmpmemctx );
+                       rs->sr_ref = is_entry_referral( p )
+                               ? get_entry_referrals( op, p )
+                               : NULL;
+                       bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+                       p = NULL;
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent "
+                               "does not exist\n", 0, 0, 0 );
 
-               switch( rc ) {
-               case 0:
-               case DB_NOTFOUND:
-                       break;
-               case DB_LOCK_DEADLOCK:
-               case DB_LOCK_NOTGRANTED:
-                       goto retry;
-               default:
-                       rc = LDAP_OTHER;
-                       text = "internal error";
+                       rs->sr_err = LDAP_REFERRAL;
+                       rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
                        goto return_results;
                }
 
-               if ( p == NULL ) {
-                       char *matched_dn = NULL;
-                       BVarray refs;
-
-                       if ( matched != NULL ) {
-                               matched_dn = ch_strdup( matched->e_dn );
-                               refs = is_entry_referral( matched )
-                                       ? get_entry_referrals( be, conn, op, matched )
-                                       : NULL;
-                               bdb_entry_return( be, matched );
-                               matched = NULL;
-
-                       } else {
-                               refs = referral_rewrite( default_referral,
-                                       NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
-                       }
+               rs->sr_err = access_allowed( op, p,
+                       children, NULL, ACL_WADD, NULL );
 
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
-                               0, 0, 0 );
-
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               matched_dn, NULL, refs, NULL );
-
-                       bvarray_free( refs );
-                       ch_free( matched_dn );
-
-                       goto done;
-               }
+               if ( ! rs->sr_err ) {
+                       switch( opinfo.boi_err ) {
+                       case DB_LOCK_DEADLOCK:
+                       case DB_LOCK_NOTGRANTED:
+                               goto retry;
+                       }
 
-               if ( ! access_allowed( be, conn, op, p,
-                       children, NULL, ACL_WRITE ) )
-               {
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": no write access to parent\n",
                                0, 0, 0 );
-                       rc = LDAP_INSUFFICIENT_ACCESS;
-                       text = "no write access to parent";
+                       rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+                       rs->sr_text = "no write access to parent";
                        goto return_results;;
                }
 
                if ( is_entry_subentry( p ) ) {
                        /* parent is a subentry, don't allow add */
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is subentry\n",
                                0, 0, 0 );
-                       rc = LDAP_OBJECT_CLASS_VIOLATION;
-                       text = "parent is a subentry";
+                       rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION;
+                       rs->sr_text = "parent is a subentry";
                        goto return_results;;
                }
-
                if ( is_entry_alias( p ) ) {
                        /* parent is an alias, don't allow add */
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is alias\n",
                                0, 0, 0 );
-                       rc = LDAP_ALIAS_PROBLEM;
-                       text = "parent is an alias";
+                       rs->sr_err = LDAP_ALIAS_PROBLEM;
+                       rs->sr_text = "parent is an alias";
                        goto return_results;;
                }
 
                if ( is_entry_referral( p ) ) {
                        /* parent is a referral, don't allow add */
-                       char *matched_dn = ch_strdup( p->e_dn );
-                       BVarray refs = is_entry_referral( p )
-                               ? get_entry_referrals( be, conn, op, p )
-                               : NULL;
-
-                       Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n",
+                       rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
+                               op->o_tmpmemctx );
+                       rs->sr_ref = get_entry_referrals( op, p );
+                       bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+                       p = NULL;
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": parent is referral\n",
                                0, 0, 0 );
 
-                       send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                               matched_dn, NULL, refs, NULL );
-
-                       bvarray_free( refs );
-                       free( matched_dn );
-                       goto done;
+                       rs->sr_err = LDAP_REFERRAL;
+                       rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
+                       goto return_results;
                }
 
                if ( subentry ) {
@@ -202,144 +231,200 @@ retry:  rc = txn_abort( ltid );
                        /* parent must be an administrative point of the required kind */
                }
 
-               /* free parent and writer lock */
-               bdb_entry_return( be, p );
+               /* free parent and reader lock */
+               bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
                p = NULL;
 
        } else {
                /*
                 * no parent!
-                *      must be adding entry at suffix or with parent ""
+                *  if not attempting to add entry at suffix or with parent ""
                 */
-               if ( !be_isroot( be, &op->o_ndn )) {
-                       if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
-                               p = (Entry *)&slap_entry_root;
-
-                               /* check parent for "children" acl */
-                               rc = access_allowed( be, conn, op, p,
-                                       children, NULL, ACL_WRITE );
-                               p = NULL;
-
-                               if ( ! rc ) {
-                                       Debug( LDAP_DEBUG_TRACE,
-                                               "bdb_add: no write access to parent\n",
-                                               0, 0, 0 );
-                                       rc = LDAP_INSUFFICIENT_ACCESS;
-                                       text = "no write access to parent";
-                                       goto return_results;;
-                               }
-
-                       } else {
-                               Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
-                                       pdn.bv_len == 0 ? "suffix" : "entry at root",
-                                       0, 0 );
-                               rc = LDAP_INSUFFICIENT_ACCESS;
-                               goto return_results;
-                       }
+               if ((( !be_isroot( op ) && !be_shadow_update(op) )
+                       || pdn.bv_len > 0 ) && !is_entry_glue( op->oq_add.rs_e ))
+               {
+                       Debug( LDAP_DEBUG_TRACE,
+                               LDAP_XSTRING(bdb_add) ": %s denied\n",
+                               pdn.bv_len == 0 ? "suffix" : "entry at root",
+                               0, 0 );
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+                       goto return_results;
                }
+       }
 
-               if( subentry ) {
-                       Debug( LDAP_DEBUG_TRACE,
-                               "bdb_add: no parent, cannot add subentry\n",
-                               0, 0, 0 );
-                       rc = LDAP_INSUFFICIENT_ACCESS;
-                       text = "no parent, cannot add subentry";
-                       goto return_results;;
+       rs->sr_err = access_allowed( op, op->oq_add.rs_e,
+               entry, NULL, ACL_WADD, NULL );
+
+       if ( ! rs->sr_err ) {
+               switch( opinfo.boi_err ) {
+               case DB_LOCK_DEADLOCK:
+               case DB_LOCK_NOTGRANTED:
+                       goto retry;
                }
+
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": no write access to entry\n",
+                       0, 0, 0 );
+               rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+               rs->sr_text = "no write access to entry";
+               goto return_results;;
+       }
+
+       /* nested transaction */
+       rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
+               bdb->bi_db_opflags );
+       rs->sr_text = NULL;
+       if( rs->sr_err != 0 ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": txn_begin(2) failed: "
+                       "%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "internal error";
+               goto return_results;
        }
 
        /* dn2id index */
-       rc = bdb_dn2id_add( be, ltid, &pdn, e );
-       if ( rc != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+       rs->sr_err = bdb_dn2id_add( op, lt2, ei, op->oq_add.rs_e );
+       if ( rs->sr_err != 0 ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": dn2id_add failed: %s (%d)\n",
+                       db_strerror(rs->sr_err), rs->sr_err, 0 );
 
-               switch( rc ) {
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                case DB_KEYEXIST:
-                       rc = LDAP_ALREADY_EXISTS;
+                       rs->sr_err = LDAP_ALREADY_EXISTS;
                        break;
                default:
-                       rc = LDAP_OTHER;
+                       rs->sr_err = LDAP_OTHER;
                }
                goto return_results;
        }
 
-       /* id2entry index */
-       rc = bdb_id2entry_add( be, ltid, e );
-       if ( rc != 0 ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
+       /* attribute indexes */
+       rs->sr_err = bdb_index_entry_add( op, lt2, op->oq_add.rs_e );
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": index_entry_add failed\n",
                        0, 0, 0 );
-               switch( rc ) {
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                default:
-                       rc = LDAP_OTHER;
+                       rs->sr_err = LDAP_OTHER;
                }
-               text = "entry store failed";
+               rs->sr_text = "index generation failed";
                goto return_results;
        }
 
-       /* attribute indexes */
-       rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
-       if ( rc != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
+       /* id2entry index */
+       rs->sr_err = bdb_id2entry_add( op->o_bd, lt2, op->oq_add.rs_e );
+       if ( rs->sr_err != 0 ) {
+               Debug( LDAP_DEBUG_TRACE,
+                       LDAP_XSTRING(bdb_add) ": id2entry_add failed\n",
                        0, 0, 0 );
-               switch( rc ) {
+               switch( rs->sr_err ) {
                case DB_LOCK_DEADLOCK:
                case DB_LOCK_NOTGRANTED:
                        goto retry;
                default:
-                       rc = LDAP_OTHER;
+                       rs->sr_err = LDAP_OTHER;
                }
-               text = "index generation failed";
+               rs->sr_text = "entry store failed";
                goto return_results;
        }
 
-       if( bdb->bi_txn ) {
-               rc = txn_commit( ltid, 0 );
+       if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
+               rs->sr_err = LDAP_OTHER;
+               rs->sr_text = "txn_commit(2) failed";
+               goto return_results;
        }
-       ltid = NULL;
-       op->o_private = NULL;
 
-       if( rc != 0 ) {
-               Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: txn_commit failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
-               rc = LDAP_OTHER;
-               text = "commit failed";
+       /* post-read */
+       if( op->o_postread ) {
+               if( postread_ctrl == NULL ) {
+                       postread_ctrl = &ctrls[num_ctrls++];
+                       ctrls[num_ctrls] = NULL;
+               }
+               if ( slap_read_controls( op, rs, op->oq_add.rs_e,
+                       &slap_post_read_bv, postread_ctrl ) )
+               {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<=- " LDAP_XSTRING(bdb_add) ": post-read "
+                               "failed!\n", 0, 0, 0 );
+                       goto return_results;
+               }
+       }
+
+       if ( op->o_noop ) {
+               if (( rs->sr_err=TXN_ABORT( ltid )) != 0 ) {
+                       rs->sr_text = "txn_abort (no-op) failed";
+               } else {
+                       rs->sr_err = LDAP_X_NO_OPERATION;
+                       ltid = NULL;
+                       goto return_results;
+               }
 
        } else {
+               struct berval nrdn;
+               Entry *e = entry_dup( op->ora_e );
+
+               /* pick the RDN if not suffix; otherwise pick the entire DN */
+               if (pdn.bv_len) {
+                       nrdn.bv_val = e->e_nname.bv_val;
+                       nrdn.bv_len = pdn.bv_val - op->ora_e->e_nname.bv_val - 1;
+               } else {
+                       nrdn = e->e_nname;
+               }
+
+               bdb_cache_add( bdb, ei, e, &nrdn, locker );
+
+               if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) {
+                       rs->sr_text = "txn_commit failed";
+               } else {
+                       rs->sr_err = LDAP_SUCCESS;
+               }
+       }
+
+       ltid = NULL;
+       op->o_private = NULL;
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "bdb_add: added id=%08lx dn=\"%s\"\n",
-                       e->e_id, e->e_dn, 0 );
-               rc = LDAP_SUCCESS;
-               text = NULL;
+                       LDAP_XSTRING(bdb_add) ": %s : %s (%d)\n",
+                       rs->sr_text, db_strerror(rs->sr_err), rs->sr_err );
+               rs->sr_err = LDAP_OTHER;
+               goto return_results;
        }
 
+       Debug(LDAP_DEBUG_TRACE,
+               LDAP_XSTRING(bdb_add) ": added%s id=%08lx dn=\"%s\"\n",
+               op->o_noop ? " (no-op)" : "",
+               op->oq_add.rs_e->e_id, op->oq_add.rs_e->e_dn );
+
+       rs->sr_text = NULL;
+       if( num_ctrls ) rs->sr_ctrls = ctrls;
+
 return_results:
-       send_ldap_result( conn, op, rc,
-               NULL, text, NULL, NULL );
+       send_ldap_result( op, rs );
+       slap_graduate_commit_csn( op );
 
-       if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
-               ldap_pvt_thread_yield();
-               TXN_CHECKPOINT( bdb->bi_dbenv,
-                       bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
+       if( ltid != NULL ) {
+               TXN_ABORT( ltid );
        }
+       op->o_private = NULL;
 
-done:
-       if (p != NULL) {
-               /* free parent and writer lock */
-               bdb_entry_return( be, p ); 
+       if( postread_ctrl != NULL ) {
+               slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
+               slap_sl_free( *postread_ctrl, op->o_tmpmemctx );
        }
 
-       if( ltid != NULL ) {
-               txn_abort( ltid );
-               op->o_private = NULL;
+       if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+               TXN_CHECKPOINT( bdb->bi_dbenv,
+                       bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
        }
-
-       return rc;
+       return rs->sr_err;
 }