You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-issues@jackrabbit.apache.org by "Marcel Reutegger (JIRA)" <ji...@apache.org> on 2016/01/11 15:44:39 UTC

[jira] [Created] (OAK-3859) Suspended commit depends on non-conflicting change

Marcel Reutegger created OAK-3859:
-------------------------------------

             Summary: Suspended commit depends on non-conflicting change
                 Key: OAK-3859
                 URL: https://issues.apache.org/jira/browse/OAK-3859
             Project: Jackrabbit Oak
          Issue Type: Bug
          Components: core, documentmk
    Affects Versions: 1.3.6
            Reporter: Marcel Reutegger
            Assignee: Marcel Reutegger
            Priority: Minor
             Fix For: 1.4


When a conflict occurs, a commit is suspended until the conflicting revision becomes visible. This feature was introduced with OAK-3042. The implementation does not distinguish between revisions that are conflicting and those that are reported as collisions. The latter just means changes happened after the base revision but may not necessarily be conflicting. E.g. different properties can be changed concurrently.

There are actually two problems:

- When a commit detects a conflict, it will create collision markers even for changes that are non conflicting. The commit should only create collision markers for conflicting changes.
- A commit with a conflict will suspend until is sees also revisions that are considered a collision but are not actually a conflict. The commit should only suspend until conflicting revisions are visible.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)