X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=2e966d3525e9cffe890aa9fd902166f6c42cd915;hb=9e4a4bc5e3a349f6609e0cec70cd898205d4b2f4;hp=07b8265283f9d5c50b15fd41bcf8813eac4600a3;hpb=b29e311ae7d44186295963c22898d72b6f49ef3c;p=openldap diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index 07b8265283..2e966d3525 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2000-2004 The OpenLDAP Foundation. + * Copyright 2000-2007 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -20,57 +20,100 @@ #include #include "back-bdb.h" -#include "external.h" int bdb_add(Operation *op, SlapReply *rs ) { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private; struct berval pdn; - Entry *p = NULL; + Entry *p = NULL, *oe = op->ora_e; EntryInfo *ei; char textbuf[SLAP_TEXT_BUFLEN]; size_t textlen = sizeof textbuf; AttributeDescription *children = slap_schema.si_ad_children; AttributeDescription *entry = slap_schema.si_ad_entry; DB_TXN *ltid = NULL, *lt2; - struct bdb_op_info opinfo; -#ifdef BDB_SUBENTRIES + struct bdb_op_info opinfo = {0}; int subentry; -#endif - u_int32_t locker = 0; + BDB_LOCKER locker = 0, rlocker = 0; DB_LOCK lock; int num_retries = 0; - - Operation* ps_list; - int rc; - EntryInfo *suffix_ei = NULL; - Entry *ctxcsn_e; - int ctxcsn_added = 0; + int success; LDAPControl **postread_ctrl = NULL; LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS]; int num_ctrls = 0; - Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", +#ifdef LDAP_X_TXN + int settle = 0; +#endif + + Debug(LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_add) ": %s\n", op->oq_add.rs_e->e_name.bv_val, 0, 0); +#ifdef LDAP_X_TXN + if( op->o_txnSpec ) { + /* acquire connection lock */ + ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); + if( op->o_conn->c_txn == CONN_TXN_INACTIVE ) { + rs->sr_text = "invalid transaction identifier"; + rs->sr_err = LDAP_X_TXN_ID_INVALID; + goto txnReturn; + } else if( op->o_conn->c_txn == CONN_TXN_SETTLE ) { + settle=1; + goto txnReturn; + } + + if( op->o_conn->c_txn_backend == NULL ) { + op->o_conn->c_txn_backend = op->o_bd; + + } else if( op->o_conn->c_txn_backend != op->o_bd ) { + rs->sr_text = "transaction cannot span multiple database contexts"; + rs->sr_err = LDAP_AFFECTS_MULTIPLE_DSAS; + goto txnReturn; + } + + /* insert operation into transaction */ + + rs->sr_text = "transaction specified"; + rs->sr_err = LDAP_X_TXN_SPECIFY_OKAY; + +txnReturn: + /* release connection lock */ + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + + if( !settle ) { + send_ldap_result( op, rs ); + return rs->sr_err; + } + } +#endif + ctrls[num_ctrls] = 0; + /* check entry's schema */ - rs->sr_err = entry_schema_check( op->o_bd, op->oq_add.rs_e, - NULL, &rs->sr_text, textbuf, textlen ); + rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL, + get_relax(op), 1, &rs->sr_text, textbuf, textlen ); + if ( rs->sr_err != LDAP_SUCCESS ) { + Debug( LDAP_DEBUG_TRACE, + LDAP_XSTRING(bdb_add) ": entry failed schema check: " + "%s (%d)\n", rs->sr_text, rs->sr_err, 0 ); + goto return_results; + } + + /* add opattrs to shadow as well, only missing attrs will actually + * be added; helps compatibility with older OL versions */ + rs->sr_err = slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 ); if ( rs->sr_err != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, - "bdb_add: entry failed schema check: %s (%d)\n", - rs->sr_text, rs->sr_err, 0 ); + LDAP_XSTRING(bdb_add) ": entry failed op attrs add: " + "%s (%d)\n", rs->sr_text, rs->sr_err, 0 ); goto return_results; } -#ifdef BDB_SUBENTRIES subentry = is_entry_subentry( op->oq_add.rs_e ); -#endif /* * acquire an ID outside of the operation transaction @@ -79,17 +122,23 @@ bdb_add(Operation *op, SlapReply *rs ) 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", rs->sr_err, 0, 0 ); + 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; } + /* Get our thread locker ID */ + rs->sr_err = LOCK_ID( bdb->bi_dbenv, &rlocker ); + if( 0 ) { retry: /* transaction retry */ if( p ) { /* free parent and reader lock */ - bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); + if ( p != (Entry *)&slap_entry_root ) { + bdb_unlocked_cache_return_entry_r( bdb, p ); + } p = NULL; } rs->sr_err = TXN_ABORT( ltid ); @@ -101,7 +150,10 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto return_results; } - ldap_pvt_thread_yield(); + if ( op->o_abandon ) { + rs->sr_err = SLAPD_ABANDON; + goto return_results; + } bdb_trans_backoff( ++num_retries ); } @@ -111,7 +163,7 @@ retry: /* transaction retry */ rs->sr_text = NULL; if( rs->sr_err != 0 ) { Debug( LDAP_DEBUG_TRACE, - "bdb_add: txn_begin failed: %s (%d)\n", + 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"; @@ -122,7 +174,6 @@ retry: /* transaction retry */ 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; @@ -158,59 +209,59 @@ retry: /* transaction retry */ } 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, "bdb_add: parent does not exist\n", - 0, 0, 0 ); + if ( !p ) + p = (Entry *)&slap_entry_root; + + 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, p ); + p = NULL; + Debug( LDAP_DEBUG_TRACE, + LDAP_XSTRING(bdb_add) ": parent " + "does not exist\n", 0, 0, 0 ); - rs->sr_err = LDAP_REFERRAL; - send_ldap_result( op, rs ); + rs->sr_err = LDAP_REFERRAL; + rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED; + goto return_results; + } - ber_bvarray_free( rs->sr_ref ); - op->o_tmpfree( (char *)rs->sr_matched, op->o_tmpmemctx ); - rs->sr_ref = NULL; - rs->sr_matched = NULL; + rs->sr_err = access_allowed( op, p, + children, NULL, ACL_WADD, NULL ); - goto done; + if ( ! rs->sr_err ) { + switch( opinfo.boi_err ) { + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + goto retry; } - rs->sr_err = access_allowed( op, p, - children, NULL, ACL_WRITE, NULL ); - - if ( ! rs->sr_err ) { - switch( opinfo.boi_err ) { - case DB_LOCK_DEADLOCK: - case DB_LOCK_NOTGRANTED: - goto retry; - } - - Debug( LDAP_DEBUG_TRACE, - "bdb_add: no write access to parent\n", 0, 0, 0 ); - rs->sr_err = LDAP_INSUFFICIENT_ACCESS; - rs->sr_text = "no write access to parent"; - goto return_results;; - } + Debug( LDAP_DEBUG_TRACE, + LDAP_XSTRING(bdb_add) ": no write access to parent\n", + 0, 0, 0 ); + rs->sr_err = LDAP_INSUFFICIENT_ACCESS; + rs->sr_text = "no write access to parent"; + goto return_results;; + } -#ifdef BDB_SUBENTRIES + if ( p != (Entry *)&slap_entry_root ) { 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 ); rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION; rs->sr_text = "parent is a subentry"; goto return_results;; } -#endif + 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 ); rs->sr_err = LDAP_ALIAS_PROBLEM; rs->sr_text = "parent is an alias"; @@ -219,60 +270,35 @@ retry: /* transaction retry */ if ( is_entry_referral( p ) ) { /* parent is a referral, don't allow add */ - rs->sr_matched = p->e_name.bv_val; + rs->sr_matched = ber_strdup_x( p->e_name.bv_val, + op->o_tmpmemctx ); rs->sr_ref = get_entry_referrals( op, p ); - - Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n", + bdb_unlocked_cache_return_entry_r( bdb, p ); + p = NULL; + Debug( LDAP_DEBUG_TRACE, + LDAP_XSTRING(bdb_add) ": parent is referral\n", 0, 0, 0 ); rs->sr_err = LDAP_REFERRAL; - send_ldap_result( op, rs ); - - ber_bvarray_free( rs->sr_ref ); - bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); - rs->sr_ref = NULL; - rs->sr_matched = NULL; - p = NULL; - goto done; - } - -#ifdef BDB_SUBENTRIES - if ( subentry ) { - /* FIXME: */ - /* parent must be an administrative point of the required kind */ + rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED; + goto return_results; } -#endif - /* free parent and reader lock */ - bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); - p = NULL; + } - } else { - /* - * no parent! - * if not attempting to add entry at suffix or with parent "" - */ - if ((( !be_isroot( op ) && !be_shadow_update(op) ) - || pdn.bv_len > 0 ) && !is_entry_glue( op->oq_add.rs_e )) - { - Debug( LDAP_DEBUG_TRACE, "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 ) { + /* FIXME: */ + /* parent must be an administrative point of the required kind */ } - if ( get_assert( op ) && - ( test_filter( op, op->oq_add.rs_e, get_assertion( op )) - != LDAP_COMPARE_TRUE )) - { - rs->sr_err = LDAP_ASSERTION_FAILED; - goto return_results; + /* free parent and reader lock */ + if ( p != (Entry *)&slap_entry_root ) { + bdb_unlocked_cache_return_entry_r( bdb, p ); } + p = NULL; rs->sr_err = access_allowed( op, op->oq_add.rs_e, - entry, NULL, ACL_WRITE, NULL ); + entry, NULL, ACL_WADD, NULL ); if ( ! rs->sr_err ) { switch( opinfo.boi_err ) { @@ -281,7 +307,8 @@ retry: /* transaction retry */ goto retry; } - Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to entry\n", + 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"; @@ -294,8 +321,8 @@ retry: /* transaction retry */ rs->sr_text = NULL; if( rs->sr_err != 0 ) { Debug( LDAP_DEBUG_TRACE, - "bdb_add: txn_begin(2) failed: %s (%d)\n", - db_strerror(rs->sr_err), rs->sr_err, 0 ); + 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; @@ -304,7 +331,8 @@ retry: /* transaction retry */ /* dn2id index */ rs->sr_err = bdb_dn2id_add( op, lt2, ei, op->oq_add.rs_e ); if ( rs->sr_err != 0 ) { - Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n", + Debug( LDAP_DEBUG_TRACE, + LDAP_XSTRING(bdb_add) ": dn2id_add failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 ); switch( rs->sr_err ) { @@ -320,10 +348,11 @@ retry: /* transaction retry */ goto return_results; } - /* 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, "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( rs->sr_err ) { case DB_LOCK_DEADLOCK: @@ -332,14 +361,15 @@ retry: /* transaction retry */ default: rs->sr_err = LDAP_OTHER; } - rs->sr_text = "entry store failed"; + rs->sr_text = "index generation failed"; goto return_results; } - /* 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, "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( rs->sr_err ) { case DB_LOCK_DEADLOCK: @@ -348,26 +378,16 @@ retry: /* transaction retry */ default: rs->sr_err = LDAP_OTHER; } - rs->sr_text = "index generation failed"; + rs->sr_text = "entry store failed"; goto return_results; } + if ( TXN_COMMIT( lt2, 0 ) != 0 ) { rs->sr_err = LDAP_OTHER; rs->sr_text = "txn_commit(2) failed"; goto return_results; } - if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) { - rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei, - &ctxcsn_e, &ctxcsn_added, locker ); - switch ( rc ) { - case BDB_CSN_ABORT : - goto return_results; - case BDB_CSN_RETRY : - goto retry; - } - } - /* post-read */ if( op->o_postread ) { if( postread_ctrl == NULL ) { @@ -378,8 +398,13 @@ retry: /* transaction retry */ &slap_post_read_bv, postread_ctrl ) ) { Debug( LDAP_DEBUG_TRACE, - "<=- bdb_add: post-read failed!\n", 0, 0, 0 ); - goto return_results; + "<=- " LDAP_XSTRING(bdb_add) ": post-read " + "failed!\n", 0, 0, 0 ); + if ( op->o_postread & SLAP_CONTROL_CRITICAL ) { + /* FIXME: is it correct to abort + * operation if control fails? */ + goto return_results; + } } } @@ -387,47 +412,24 @@ retry: /* transaction retry */ if (( rs->sr_err=TXN_ABORT( ltid )) != 0 ) { rs->sr_text = "txn_abort (no-op) failed"; } else { - rs->sr_err = LDAP_NO_OPERATION; + 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_val = op->ora_e->e_nname.bv_val; nrdn.bv_len = pdn.bv_val - op->ora_e->e_nname.bv_val - 1; } else { - nrdn = e->e_nname; + nrdn = op->ora_e->e_nname; } - bdb_cache_add( bdb, ei, e, &nrdn, locker ); - - if ( suffix_ei == NULL ) { - suffix_ei = BEI(e); - } - - if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) { - if ( ctxcsn_added ) { - bdb_cache_add( bdb, suffix_ei, ctxcsn_e, - (struct berval *)&slap_ldapsync_cn_bv, locker ); - } - } - - if ( rs->sr_err == LDAP_SUCCESS && !op->o_no_psearch ) { - ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock ); - assert( BEI(e) ); - LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) { - rc = bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_ADD ); - if ( rc ) { - Debug( LDAP_DEBUG_TRACE, - "bdb_add: persistent search failed (%d,%d)\n", - rc, rs->sr_err, 0 ); - } - } - ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock ); - } + /* Use the thread locker here, outside the txn */ + bdb_cache_add( bdb, ei, op->ora_e, &nrdn, rlocker, &lock ); if(( rs->sr_err=TXN_COMMIT( ltid, 0 )) != 0 ) { rs->sr_text = "txn_commit failed"; @@ -440,13 +442,15 @@ retry: /* transaction retry */ op->o_private = NULL; if ( rs->sr_err != LDAP_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n", + Debug( LDAP_DEBUG_TRACE, + 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, "bdb_add: added%s id=%08lx dn=\"%s\"\n", + 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 ); @@ -454,23 +458,35 @@ retry: /* transaction retry */ if( num_ctrls ) rs->sr_ctrls = ctrls; return_results: + success = rs->sr_err; send_ldap_result( op, rs ); + slap_graduate_commit_csn( op ); - if( rs->sr_err == 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 ); - } - -done: if( ltid != NULL ) { TXN_ABORT( ltid ); - op->o_private = NULL; } + op->o_private = NULL; + + if( success == LDAP_SUCCESS ) { + /* We own the entry now, and it can be purged at will + * Check to make sure it's the same entry we entered with. + * Possibly a callback may have mucked with it, although + * in general callbacks should treat the entry as read-only. + */ + bdb_cache_return_entry_r( bdb, oe, &lock ); + if ( op->ora_e == oe ) + op->ora_e = NULL; - 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 ( bdb->bi_txn_cp_kbyte ) { + TXN_CHECKPOINT( bdb->bi_dbenv, + bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 ); + } } + + if( postread_ctrl != NULL && (*postread_ctrl) != NULL ) { + slap_sl_free( (*postread_ctrl)->ldctl_value.bv_val, op->o_tmpmemctx ); + slap_sl_free( *postread_ctrl, op->o_tmpmemctx ); + } + return rs->sr_err; }