[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-directory-commits
Subject:    [389-commits] Branch '389-ds-base-1.3.1' - ldap/servers
From:       Richard Allen Megginson <rmeggins () fedoraproject ! org>
Date:       2013-06-28 17:38:32
Message-ID: 20130628173832.4E782614A2 () fedorahosted ! org
[Download RAW message or body]

 ldap/servers/slapd/back-ldbm/dblayer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ceaa9ac5267c04c23e3fb8e366e17295ffd6b93c
Author: Rich Megginson <rmeggins@redhat.com>
Date:   Fri Jun 28 11:37:05 2013 -0600

    Ticket #47409 - allow setting db deadlock rejection policy
    
    https://fedorahosted.org/389/ticket/47409
    Reviewed by: nhosoi (Thanks!)
    Branch: master
    Fix Description: Forgot to add flags parameter to last commit.
    Platforms tested: RHEL6 x86_64
    Flag Day: no
    Doc impact: yes - document new config parameter
    (cherry picked from commit 67cbb2eac1300ae57acf75f4c3299103046a3323)

diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c \
b/ldap/servers/slapd/back-ldbm/dblayer.c index 208f28a..5a85c9c 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -4316,7 +4316,7 @@ static int deadlock_threadmain(void *param)
             if (dblayer_db_uses_locking(db_env) && (deadlock_policy > \
DB_LOCK_NORUN)) {  int rejected = 0;
 
-                if ((rval = LOCK_DETECT(db_env, 0, deadlock_policy, &rejected)) != \
0) { +                if ((rval = LOCK_DETECT(db_env, flags, deadlock_policy, \
&rejected)) != 0) {  LDAPDebug(LDAP_DEBUG_ANY,
                               "Serious Error---Failed in deadlock detect (aborted at \
0x%x), err=%d (%s)\n",  rejected, rval, dblayer_strerror(rval));


--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits


[prev in list] [next in list] [prev in thread] [next in thread]