From: Howard Chu <hyc@openldap.org>
Date: Mon, 12 Jul 2004 20:02:24 +0000 (+0000)
Subject: Don't bother logging lock failures for tryOnly mode
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=856a8c117757162126fababfdc95ffc492e9cd97;p=openldap

Don't bother logging lock failures for tryOnly mode
---

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index 23b35fe397..d306add2a5 100644
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -88,7 +88,7 @@ bdb_cache_entry_db_relock(
 	rc = env->lock_vec(env, locker, tryOnly ? DB_LOCK_NOWAIT : 0,
 		list, 2, NULL );
 
-	if (rc) {
+	if (rc && !tryOnly) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( CACHE, DETAIL1, 
 			"bdb_cache_entry_db_relock: entry %ld, rw %d, rc %d\n",
@@ -128,7 +128,7 @@ bdb_cache_entry_db_lock( DB_ENV *env, u_int32_t locker, EntryInfo *ei,
 
 	rc = LOCK_GET(env, locker, tryOnly ? DB_LOCK_NOWAIT : 0,
 					&lockobj, db_rw, lock);
-	if (rc) {
+	if (rc && !tryOnly) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( CACHE, DETAIL1, 
 			"bdb_cache_entry_db_lock: entry %ld, rw %d, rc %d\n",