Add debug if bdb_cache_entry_db_lock fails to get a lock

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

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index 0e05443926b91970ecebf9e9b951c6c76ed4cb32..4988e2512238ec18fc82af4e06a25b1fde51f57d 100644 (file)
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -41,6 +41,9 @@ bdb_exop_passwd(
        struct berval dn;
        struct berval ndn;
 
+       u_int32_t       locker;
+       DB_LOCK         lock;
+
        assert( reqoid != NULL );
        assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
 
@@ -48,8 +51,8 @@ bdb_exop_passwd(
                &id, NULL, &new, text );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "passwd", LDAP_LEVEL_ENTRY, "==>bdb_exop_passwd: \"%s\"\n",
-               id.bv_val ? id.bv_val : "" ));
+       LDAP_LOG ( ACL, ENTRY, 
+               "==>bdb_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0  );
 #else
        Debug( LDAP_DEBUG_ARGS, "==> bdb_exop_passwd: \"%s\"\n",
                id.bv_val ? id.bv_val : "", 0, 0 );
@@ -86,8 +89,8 @@ bdb_exop_passwd(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "passwd", LDAP_LEVEL_DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n",
-               dn.bv_val, id.bv_len ? " (proxy)" : "" ));
+       LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: \"%s\"%s\"\n",
+               dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: \"%s\"%s\n",
                dn.bv_val, id.bv_len ? " (proxy)" : "", 0 );
@@ -95,7 +98,7 @@ bdb_exop_passwd(
 
        if( dn.bv_len == 0 ) {
                *text = "No password is associated with the Root DSE";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_UNWILLING_TO_PERFORM;
                goto done;
        }
 
@@ -109,10 +112,10 @@ bdb_exop_passwd(
 retry: /* transaction retry */
                if ( e != NULL ) {
                        bdb_cache_delete_entry(&bdb->bi_cache, e);
-                       bdb_cache_return_entry_w(&bdb->bi_cache, e);
+                       bdb_cache_return_entry_w(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "passwd", LDAP_LEVEL_DETAIL1, "bdb_exop_passwd: retrying...\n" ));
+               LDAP_LOG ( ACL, DETAIL1, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: retrying...\n", 0, 0, 0 );
 #endif
@@ -133,7 +136,9 @@ retry:      /* transaction retry */
        *text = NULL;
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "passwd", LDAP_LEVEL_ERR, "bdb_exop_passwd: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+               LDAP_LOG ( ACL, ERR, 
+                       "bdb_exop_passwd: txn_begin failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_exop_passwd: txn_begin failed: %s (%d)\n",
@@ -144,13 +149,15 @@ retry:    /* transaction retry */
                goto done;
        }
 
+       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, NULL, 0 );
+       rc = bdb_dn2entry_w( be, ltid, &ndn, &e, NULL, 0 , locker, &lock);
 
        switch(rc) {
        case DB_LOCK_DEADLOCK:
@@ -256,7 +263,7 @@ retry:      /* transaction retry */
 
 done:
        if( e != NULL ) {
-               bdb_cache_return_entry_w( &bdb->bi_cache, e );
+               bdb_cache_return_entry_w( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
        }
                
        if( hash.bv_val != NULL ) {