X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fadd.c;h=983ddd9dba9c5c56ab6d25c083c8f70a85c7885c;hb=fb7ac08adae76c588fde2a5eccf70b879c555beb;hp=b7cc3e70ef661f6a08cb1c6d0550da567177b2fc;hpb=60b1ee1ba99e8acae83ff7348b307dbda4af6a73;p=openldap

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index b7cc3e70ef..983ddd9dba 100644
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -23,7 +23,7 @@ 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;
@@ -33,13 +33,15 @@ bdb_add(
 #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 (( "add", LDAP_LEVEL_ARGS, "==> bdb_add: %s\n", e->e_dn ));
+	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
@@ -48,7 +50,8 @@ bdb_add(
 	rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
 	if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-	LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: entry failed schema check: %s (%d)\n", text, rc ));
+	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",
@@ -68,7 +71,8 @@ bdb_add(
 	rc = bdb_next_id( be, NULL, &e->e_id );
 	if( rc != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: next_id failed (%d)\n", rc ));
+		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",
@@ -98,7 +102,8 @@ retry:	/* transaction retry */
 	text = NULL;
 	if( rc != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+		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",
@@ -108,6 +113,8 @@ retry:	/* transaction retry */
 		text = "internal error";
 		goto return_results;
 	}
+
+	locker = TXN_ID ( ltid );
 #if 0
 	lockid = TXN_ID( ltid );
 #endif
@@ -142,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:
@@ -169,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 {
@@ -178,7 +185,8 @@ retry:	/* transaction retry */
 			}
 
 #ifdef NEW_LOGGING
-			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent does not exist\n" ));
+			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 );
@@ -200,14 +208,15 @@ retry:	/* transaction retry */
 		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 (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
+			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 );
@@ -221,7 +230,8 @@ retry:	/* transaction retry */
 		if ( is_entry_subentry( p ) ) {
 			/* parent is a subentry, don't allow add */
 #ifdef NEW_LOGGING
-			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is subentry\n" ));
+			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 );
@@ -235,7 +245,8 @@ retry:	/* transaction retry */
 		if ( is_entry_alias( p ) ) {
 			/* parent is an alias, don't allow add */
 #ifdef NEW_LOGGING
-			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is alias\n" ));
+			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 );
@@ -252,7 +263,8 @@ retry:	/* transaction retry */
 			BerVarray refs = get_entry_referrals( be, conn, op, p );
 
 #ifdef NEW_LOGGING
-			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: parent is referral\n" ));
+			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 );
@@ -262,7 +274,7 @@ retry:	/* transaction retry */
 				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;
 		}
@@ -275,7 +287,7 @@ retry:	/* transaction retry */
 #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 {
@@ -301,7 +313,8 @@ retry:	/* transaction retry */
 
 				if ( ! rc ) {
 #ifdef NEW_LOGGING
-					LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no write access to parent\n" ));
+					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",
@@ -314,7 +327,8 @@ retry:	/* transaction retry */
 
 			} else {
 #ifdef NEW_LOGGING
-				LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: %s denied\n", pdn.bv_len == 0 ? "suffix" : "entry at root" ));
+				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",
@@ -328,7 +342,8 @@ retry:	/* transaction retry */
 #ifdef BDB_SUBENTRIES
 		if( subentry ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG (( "add", LDAP_LEVEL_DETAIL1, "bdb_add: no parent, cannot add subentry\n" ));
+			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",
@@ -354,7 +369,8 @@ retry:	/* transaction retry */
 	rc = bdb_dn2id_add( be, ltid, &pdn, e );
 	if ( rc != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc ));
+		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 );
@@ -377,7 +393,7 @@ retry:	/* transaction retry */
 	rc = bdb_id2entry_add( be, ltid, e );
 	if ( rc != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: id2entry_add failed\n" ));
+		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 );
@@ -397,7 +413,8 @@ retry:	/* transaction retry */
 	rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
 	if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: index_entry_add failed\n" ));
+		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 );
@@ -430,9 +447,22 @@ retry:	/* transaction retry */
 			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 {
@@ -454,7 +484,9 @@ retry:	/* transaction retry */
 
 	if (rc == LDAP_SUCCESS) {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_RESULTS, "bdb_add: added%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn ));
+		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 );
@@ -464,7 +496,8 @@ retry:	/* transaction retry */
 	}
 	else {
 #ifdef NEW_LOGGING
-		LDAP_LOG (( "add", LDAP_LEVEL_ERR, "bdb_add: %s : %s (%d)\n", text, db_strerror(rc), rc ));
+		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 );