|
 |
dc8c34 |
From ab4b93abbf08e172825ce13daed4e586b49ec212 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Fri, 28 Jun 2013 11:37:05 -0600
|
|
|
dc8c34 |
Subject: [PATCH 78/99] Ticket #47409 - allow setting db deadlock rejection
|
|
|
dc8c34 |
policy
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47409
|
|
|
dc8c34 |
Reviewed by: nhosoi (Thanks!)
|
|
|
dc8c34 |
Branch: master
|
|
|
dc8c34 |
Fix Description: Forgot to add flags parameter to last commit.
|
|
|
dc8c34 |
Platforms tested: RHEL6 x86_64
|
|
|
dc8c34 |
Flag Day: no
|
|
|
dc8c34 |
Doc impact: yes - document new config parameter
|
|
|
dc8c34 |
(cherry picked from commit 67cbb2eac1300ae57acf75f4c3299103046a3323)
|
|
|
dc8c34 |
(cherry picked from commit ceaa9ac5267c04c23e3fb8e366e17295ffd6b93c)
|
|
|
dc8c34 |
(cherry picked from commit e535ff5a45601c4279a14e92eaf1d68729866d38)
|
|
|
dc8c34 |
(cherry picked from commit 6c1a71310292e5992aa1fcc8c203a6b6d595ebe3)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/back-ldbm/dblayer.c | 2 +-
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
dc8c34 |
index 85e4a18..8696834 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
dc8c34 |
@@ -4227,7 +4227,7 @@ static int deadlock_threadmain(void *param)
|
|
|
dc8c34 |
if (dblayer_db_uses_locking(db_env) && (deadlock_policy > DB_LOCK_NORUN)) {
|
|
|
dc8c34 |
int rejected = 0;
|
|
|
dc8c34 |
|
|
|
dc8c34 |
- if ((rval = LOCK_DETECT(db_env, 0, deadlock_policy, &rejected)) != 0) {
|
|
|
dc8c34 |
+ if ((rval = LOCK_DETECT(db_env, flags, deadlock_policy, &rejected)) != 0) {
|
|
|
dc8c34 |
LDAPDebug(LDAP_DEBUG_ANY,
|
|
|
dc8c34 |
"Serious Error---Failed in deadlock detect (aborted at 0x%x), err=%d (%s)\n",
|
|
|
dc8c34 |
rejected, rval, dblayer_strerror(rval));
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|