Return-Path: X-Original-To: apmail-jackrabbit-dev-archive@www.apache.org Delivered-To: apmail-jackrabbit-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D32F91B7 for ; Tue, 10 Apr 2012 18:45:36 +0000 (UTC) Received: (qmail 30563 invoked by uid 500); 10 Apr 2012 18:45:35 -0000 Delivered-To: apmail-jackrabbit-dev-archive@jackrabbit.apache.org Received: (qmail 30489 invoked by uid 500); 10 Apr 2012 18:45:35 -0000 Mailing-List: contact dev-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list dev@jackrabbit.apache.org Received: (qmail 30472 invoked by uid 99); 10 Apr 2012 18:45:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 18:45:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.116] (HELO hel.zones.apache.org) (140.211.11.116) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 18:45:33 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [140.211.11.116]) by hel.zones.apache.org (Postfix) with ESMTP id 910AA355E75 for ; Tue, 10 Apr 2012 18:45:13 +0000 (UTC) Date: Tue, 10 Apr 2012 18:45:13 +0000 (UTC) From: "Unico Hommes (Updated) (JIRA)" To: dev@jackrabbit.apache.org Message-ID: <447963944.8925.1334083513595.JavaMail.tomcat@hel.zones.apache.org> In-Reply-To: <1067202824.8135.1334076077594.JavaMail.tomcat@hel.zones.apache.org> Subject: [jira] [Updated] (JCR-3290) Concurrent add and move can cause inconsistency MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/JCR-3290?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Unico Hommes updated JCR-3290: ------------------------------ Description: The scenario is as follows: We start out with the following repository structure: /folder1/node1 /folder2 Session s1 modifies /folder1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for /folder1) Session s2 moves /folder1/node1 to /folder2/node1 Session s2 does a save Session s1 modifies /folder2/node1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for node2) Session s1 does a save The repository is now inconsistent: /folder1 has a child node entry for node1 whereas node1 has parent id for /folder2 The problem is in the NodeStateMerger.merge method. When on s1.save a merge is attempted on the child node entries of /folder1 the transient state has a child node entry for node1 (which was actually moved to /folder2). This expected. The merger decides to add this node if one of two conditions is true: the child node entry is either in the added set of the change log or it is in the modified set of the change log (the latter because the child node will be in the modified set if it was moved to this node). The latter condition is the problem. Because node1 was modified it is indeed in the modified set and thus added. However it has a different parent id (the parent id of the folder it was moved to). That means that /folder1 is saved with a child node entry for node1. Attached is a test case that shows that the above scenario leads to an inconsistency. Also attached is a proposal for a fix. The fix checks whether the child node entry to be added actually has the state that is currently being merged as its parent and only adds it when it does. was: The scenario is as follows: We start out with the following repository structure: /folder1/node1 /folder2 Session s1 modifies /folder1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for /folder1) Session s2 moves /folder1/node1 to /folder2/node1 Session s2 does a save Session s1 modifies /folder2/node1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for node2) Session s1 does a save The repository is now inconsistent: /folder1 has a child node entry for node1 whereas node1 has parent id for /folder2 The problem is in the NodeStateMerger.merge method. When on s1.save a merge is attempted on the child node entries of /folder1 the transient state has a child node entry for node1 (which was actually moved to /folder2). This expected. The merger decides to add this node if one of two conditions is true: the child node entry is either in the added set of the change log or it is in the modified set of the change log (the latter because the child node will be in the modified set if it was moved to this node). The latter condition is the problem. Because node1 was modified it is indeed in the modified set and thus added. However it has a different parent id (the parent id of the folder it was moved to). That means that /folder1 is saved with a child node entry for node1. Attached is a test case that shows that the above scenario leads to an inconsistency. Also attached is a proposal for a fix. The patch modifies the semantics of NodeStateMerger.MergerContext#isAdded somewhat: it returns true if either the child is in the added set or it is both in the modified set and its parent is the state that is currently being merged. Perhaps the method should be renamed to isAddedTo instead of just isAdded. > Concurrent add and move can cause inconsistency > ----------------------------------------------- > > Key: JCR-3290 > URL: https://issues.apache.org/jira/browse/JCR-3290 > Project: Jackrabbit Content Repository > Issue Type: Bug > Affects Versions: 2.2.11, 2.4 > Reporter: Unico Hommes > Priority: Critical > Fix For: 2.2.12, 2.4.2 > > Attachments: AddMoveTest.patch, SISMMerger.patch > > > The scenario is as follows: > We start out with the following repository structure: > /folder1/node1 > /folder2 > Session s1 modifies /folder1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for /folder1) > Session s2 moves /folder1/node1 to /folder2/node1 > Session s2 does a save > Session s1 modifies /folder2/node1 (for instance set a property or add a node, it doesn't matter, as long as it creates a transient item state for node2) > Session s1 does a save > The repository is now inconsistent: /folder1 has a child node entry for node1 whereas node1 has parent id for /folder2 > The problem is in the NodeStateMerger.merge method. When on s1.save a merge is attempted on the child node entries of /folder1 the transient state has a child node entry for node1 (which was actually moved to /folder2). This expected. The merger decides to add this node if one of two conditions is true: the child node entry is either in the added set of the change log or it is in the modified set of the change log (the latter because the child node will be in the modified set if it was moved to this node). The latter condition is the problem. Because node1 was modified it is indeed in the modified set and thus added. > However it has a different parent id (the parent id of the folder it was moved to). That means that /folder1 is saved with a child node entry for node1. > Attached is a test case that shows that the above scenario leads to an inconsistency. > Also attached is a proposal for a fix. The fix checks whether the child node entry to be added actually has the state that is currently being merged as its parent and only adds it when it does. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira