X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=983ddd9dba9c5c56ab6d25c083c8f70a85c7885c;hb=fb7ac08adae76c588fde2a5eccf70b879c555beb;hp=1a8a66acc50139537a8266acfe7e74b86f128f26;hpb=6bac96b0bd845f5445869531968d14529480f1e5;p=openldap diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c index 1a8a66acc5..983ddd9dba 100644 --- a/servers/slapd/back-bdb/add.c +++ b/servers/slapd/back-bdb/add.c @@ -23,31 +23,46 @@ bdb_add( struct bdb_info *bdb = (struct bdb_info *) be->be_private; struct berval pdn; Entry *p = NULL; - int rc; + int rc, ret; const char *text; 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; +#ifdef BDB_SUBENTRIES int subentry; +#endif + u_int32_t locker; + DB_LOCK lock; #if 0 u_int32_t lockid; DB_LOCK lock; #endif +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0 ); +#else Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0); +#endif /* check entry's schema */ rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen ); if ( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: entry failed schema check: %s (%d)\n", text, rc, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: entry failed schema check: %s (%d)\n", text, rc, 0 ); +#endif goto return_results; } +#ifdef BDB_SUBENTRIES subentry = is_entry_subentry( e ); +#endif /* * acquire an ID outside of the operation transaction @@ -55,17 +70,22 @@ bdb_add( */ rc = bdb_next_id( be, NULL, &e->e_id ); if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: next_id failed (%d)\n", rc, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: next_id failed (%d)\n", rc, 0, 0 ); +#endif rc = LDAP_OTHER; text = "internal error"; goto return_results; } if( 0 ) { -retry: /* transaction retry */ - rc = txn_abort( ltid ); +retry: /* transaction retry */ + rc = TXN_ABORT( ltid ); ltid = NULL; op->o_private = NULL; if( rc != 0 ) { @@ -77,23 +97,28 @@ retry: /* transaction retry */ } /* begin transaction */ - if( bdb->bi_txn ) { - rc = txn_begin( bdb->bi_dbenv, NULL, <id, - 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; - } -#if 0 - lockid = TXN_ID( ltid ); + rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id, + bdb->bi_db_opflags ); + text = NULL; + if( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "bdb_add: txn_begin failed: %s (%d)\n", + db_strerror(rc), rc, 0 ); #endif + rc = LDAP_OTHER; + text = "internal error"; + goto return_results; } + locker = TXN_ID ( ltid ); +#if 0 + lockid = TXN_ID( ltid ); +#endif + opinfo.boi_bdb = be; opinfo.boi_txn = ltid; opinfo.boi_err = 0; @@ -124,7 +149,7 @@ retry: /* transaction retry */ #endif /* get parent */ - rc = bdb_dn2entry_r( be, ltid, &pdn, &p, &matched, 0 ); + rc = bdb_dn2entry_r( be, ltid, &pdn, &p, &matched, 0, locker, &lock ); switch( rc ) { case 0: @@ -133,6 +158,9 @@ retry: /* transaction retry */ case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: goto retry; + case LDAP_BUSY: + text = "ldap server busy"; + goto return_results; default: rc = LDAP_OTHER; text = "internal error"; @@ -148,7 +176,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 { @@ -156,8 +184,13 @@ retry: /* transaction retry */ NULL, &e->e_name, LDAP_SCOPE_DEFAULT ); } +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: parent does not exist\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n", 0, 0, 0 ); +#endif send_ldap_result( conn, op, rc = LDAP_REFERRAL, matched_dn, NULL, refs, NULL ); @@ -169,67 +202,92 @@ retry: /* transaction retry */ } rc = access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ); + children, NULL, ACL_WRITE, NULL ); switch( opinfo.boi_err ) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: /* free parent and reader lock */ - bdb_cache_return_entry_r( &bdb->bi_cache, p ); + bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); p = NULL; goto retry; } if ( ! rc ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: no write access to parent\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n", 0, 0, 0 ); +#endif rc = LDAP_INSUFFICIENT_ACCESS; text = "no write access to parent"; goto return_results;; } +#ifdef BDB_SUBENTRIES if ( is_entry_subentry( p ) ) { /* parent is a subentry, don't allow add */ +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: parent is subentry\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n", 0, 0, 0 ); +#endif rc = LDAP_OBJECT_CLASS_VIOLATION; text = "parent is a subentry"; goto return_results;; } - +#endif +#ifdef BDB_ALIASES if ( is_entry_alias( p ) ) { /* parent is an alias, don't allow add */ +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: parent is alias\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n", 0, 0, 0 ); +#endif rc = LDAP_ALIAS_PROBLEM; text = "parent is an alias"; goto return_results;; } +#endif if ( is_entry_referral( p ) ) { /* parent is a referral, don't allow add */ char *matched_dn = p->e_dn; BerVarray refs = get_entry_referrals( be, conn, op, p ); +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: parent is referral\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n", 0, 0, 0 ); +#endif send_ldap_result( conn, op, rc = LDAP_REFERRAL, matched_dn, NULL, refs, NULL ); ber_bvarray_free( refs ); - bdb_cache_return_entry_r( &bdb->bi_cache, p ); + bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); p = NULL; goto done; } +#ifdef BDB_SUBENTRIES if ( subentry ) { /* FIXME: */ /* parent must be an administrative point of the required kind */ } +#endif /* free parent and reader lock */ - bdb_cache_return_entry_r( &bdb->bi_cache, p ); + bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p ); p = NULL; } else { @@ -244,7 +302,7 @@ retry: /* transaction retry */ /* check parent for "children" acl */ rc = access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ); + children, NULL, ACL_WRITE, NULL ); p = NULL; switch( opinfo.boi_err ) { @@ -254,31 +312,48 @@ retry: /* transaction retry */ } if ( ! rc ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: no write access to parent\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n", 0, 0, 0 ); +#endif rc = LDAP_INSUFFICIENT_ACCESS; text = "no write access to parent"; goto return_results;; } } else { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n", + pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n", pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 ); +#endif rc = LDAP_INSUFFICIENT_ACCESS; goto return_results; } } +#ifdef BDB_SUBENTRIES if( subentry ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, DETAIL1, + "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 ); +#endif rc = LDAP_INSUFFICIENT_ACCESS; text = "no parent, cannot add subentry"; goto return_results;; } +#endif #if 0 if ( ltid ) { DBT obj; @@ -293,8 +368,13 @@ retry: /* transaction retry */ /* dn2id index */ rc = bdb_dn2id_add( be, ltid, &pdn, e ); if ( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc, 0 ); +#endif switch( rc ) { case DB_LOCK_DEADLOCK: @@ -312,8 +392,12 @@ retry: /* transaction retry */ /* id2entry index */ rc = bdb_id2entry_add( be, ltid, e ); if ( rc != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, "bdb_add: id2entry_add failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n", 0, 0, 0 ); +#endif switch( rc ) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: @@ -328,8 +412,13 @@ retry: /* transaction retry */ /* attribute indexes */ rc = bdb_index_entry_add( be, ltid, e, e->e_attrs ); if ( rc != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: index_entry_add failed\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n", 0, 0, 0 ); +#endif switch( rc ) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: @@ -341,35 +430,80 @@ retry: /* transaction retry */ goto return_results; } - if( bdb->bi_txn ) { - rc = txn_commit( ltid, 0 ); + if( op->o_noop ) { + if (( rc=TXN_ABORT( ltid )) != 0 ) { + text = "txn_abort (no-op) failed"; + } else { + rc = LDAP_SUCCESS; + } + + } else { + char gid[DB_XIDDATASIZE]; + + snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx", + bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid ); + + if (( rc=TXN_PREPARE( ltid, gid )) != 0 ) { + text = "txn_prepare failed"; + + } else { + ret = bdb_cache_add_entry_rw(bdb->bi_dbenv, &bdb->bi_cache, e, CACHE_WRITE_LOCK, locker, &lock); +#if 0 + if ( bdb_cache_add_entry_rw(&bdb->bi_cache, + e, CACHE_WRITE_LOCK) != 0 ) +#endif + switch ( ret ) { + case 0: + break; + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + goto retry; + default: + ret = LDAP_OTHER; + } + + if ( ret ) { + if(( rc=TXN_ABORT( ltid )) != 0 ) { + text = "cache add & txn_abort failed"; + } else { + rc = LDAP_OTHER; + text = "cache add failed"; + } + } else { + if(( rc=TXN_COMMIT( ltid, 0 )) != 0 ) { + text = "txn_commit failed"; + } else { + rc = LDAP_SUCCESS; + } + } + } } + 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"; - - } else { - /* add the entry to the entry cache */ - /* we should add to cache only upon free of txn-abort */ - if (bdb_cache_add_entry_rw(&bdb->bi_cache, e, CACHE_WRITE_LOCK) != 0) { - text = "cache add failed"; - goto return_results; - } - - Debug( LDAP_DEBUG_TRACE, - "bdb_add: added id=%08lx dn=\"%s\"\n", - e->e_id, e->e_dn, 0 ); - rc = LDAP_SUCCESS; + if (rc == LDAP_SUCCESS) { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, RESULTS, + "bdb_add: added%s id=%08lx dn=\"%s\"\n", + op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ); +#else + Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n", + op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ); +#endif text = NULL; + bdb_cache_entry_commit( e ); + } + else { +#ifdef NEW_LOGGING + LDAP_LOG ( OPERATION, ERR, + "bdb_add: %s : %s (%d)\n", text, db_strerror(rc), rc ); +#else + Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n", + text, db_strerror(rc), rc ); +#endif + rc = LDAP_OTHER; } - - bdb_cache_entry_commit (e); return_results: send_ldap_result( conn, op, rc, @@ -384,7 +518,7 @@ return_results: done: if( ltid != NULL ) { - txn_abort( ltid ); + TXN_ABORT( ltid ); op->o_private = NULL; }