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

List:       fedora-directory-commits
Subject:    [389-commits] Branch '389-ds-base-1.2.11' - ldap/servers
From:       Noriko Hosoi <nhosoi () fedoraproject ! org>
Date:       2013-06-28 20:46:40
Message-ID: 20130628204640.2C23660D5A () fedorahosted ! org
[Download RAW message or body]

 ldap/servers/slapd/back-ldbm/ldbm_add.c    |    2 +-
 ldap/servers/slapd/back-ldbm/ldbm_modify.c |   19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit bc62f8276924f836613a311a0f133c9b548fad9a
Author: Noriko Hosoi <nhosoi@redhat.com>
Date:   Fri Jun 28 13:34:54 2013 -0700

    Ticket #47412 - Modify RUV should be serialized in ldbm_back_modify/add
    
    Bug Description: Current ldbm_back_modify and _add allow RUV to
    update without respecting other threads in the backend's critical
    area. It gives a chance for 2 threads trying to modify RUV at the
    same time in the 2 different transactions which causes the DB
    deadlocks.
    
    Fix Description: This patch changes the policy for RUV to skip
    the backend serial lock.
    
    https://fedorahosted.org/389/ticket/47412
    
    Reviewed by Rich (Thank you!!)

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c \
b/ldap/servers/slapd/back-ldbm/ldbm_add.c index 158dc8e..78ca565 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -159,7 +159,7 @@ ldbm_back_add( Slapi_PBlock *pb )
 	 * operations that the URP code in the Replication
 	 * plugin generates.
 	 */
-	if(SERIALLOCK(li) && !is_fixup_operation)
+	if(SERIALLOCK(li) && (!is_fixup_operation || is_ruv))
 	{
 		dblayer_lock_backend(be);
 		dblock_acquired= 1;
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c \
b/ldap/servers/slapd/back-ldbm/ldbm_modify.c index ca66b71..66b8ab8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -394,7 +394,7 @@ ldbm_back_modify( Slapi_PBlock *pb )
 	 * operations that the URP code in the Replication
 	 * plugin generates.
 	 */
-	if(SERIALLOCK(li) && !operation_is_flag_set(operation,OP_FLAG_REPL_FIXUP)) {
+	if(SERIALLOCK(li) && (!is_fixup_operation || is_ruv)) {
 		dblayer_lock_backend(be);
 		dblock_acquired= 1;
 	}
@@ -405,15 +405,14 @@ ldbm_back_modify( Slapi_PBlock *pb )
 		goto error_return;	  /* error result sent by find_entry2modify() */
 	}
 
-	if ( !is_fixup_operation )
-	{
-                if (slapi_entry_flag_is_set(e->ep_entry, SLAPI_ENTRY_FLAG_TOMBSTONE) \
                ) {
-                        ldap_result_code = LDAP_UNWILLING_TO_PERFORM;
-                        ldap_result_message = "Operation not allowed on tombstone \
                entry.";
-                        slapi_log_error(SLAPI_LOG_FATAL, "ldbm_back_modify",
-                            "Attempt to modify a tombstone entry %s\n", \
                slapi_sdn_get_dn(slapi_entry_get_sdn_const( e->ep_entry )));
-                        goto error_return;
-                }
+	if (!is_fixup_operation) {
+		if (slapi_entry_flag_is_set(e->ep_entry, SLAPI_ENTRY_FLAG_TOMBSTONE)) {
+			ldap_result_code = LDAP_UNWILLING_TO_PERFORM;
+			ldap_result_message = "Operation not allowed on tombstone entry.";
+			slapi_log_error(SLAPI_LOG_FATAL, "ldbm_back_modify",
+			    "Attempt to modify a tombstone entry %s\n", \
slapi_sdn_get_dn(slapi_entry_get_sdn_const( e->ep_entry ))); +			goto error_return;
+		}
 		opcsn = operation_get_csn (operation);
 		if (NULL == opcsn && operation->o_csngen_handler)
 		{


--
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]