jackrabbit-oak-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Julian Reschke (Jira)" <j...@apache.org>
Subject [jira] [Commented] (OAK-8623) Improve collision handling performance
Date Fri, 04 Oct 2019 10:35:00 GMT

    [ https://issues.apache.org/jira/browse/OAK-8623?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16944389#comment-16944389

Julian Reschke commented on OAK-8623:

I see frequent test failures in my local build:

[ERROR] Tests run: 6, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.046 s <<<
FAILURE! - in org.apache.jackrabbit.oak.plugins.document.CollisionTest
[ERROR] collisionWithBranchOnForeignOrphanedBranchAfterRestart(org.apache.jackrabbit.oak.plugins.document.CollisionTest)
 Time elapsed: 0.01 s  <<< FAILURE!

Expected: an empty collection
     but: <[r16d96506ce0-1-1]>
        at org.apache.jackrabbit.oak.plugins.document.CollisionTest.assertNoCollisions(CollisionTest.java:359)
        at org.apache.jackrabbit.oak.plugins.document.CollisionTest.collisionWithBranchOnForeignOrphanedBranchAfterRestart(CollisionTest.java:353)


> Improve collision handling performance
> --------------------------------------
>                 Key: OAK-8623
>                 URL: https://issues.apache.org/jira/browse/OAK-8623
>             Project: Jackrabbit Oak
>          Issue Type: Improvement
>          Components: documentmk
>            Reporter: Marcel Reutegger
>            Assignee: Marcel Reutegger
>            Priority: Major
>             Fix For: 1.20.0
>         Attachments: OAK-8623-2.patch, OAK-8623.patch
> The current collision handling on conflict in the DocumentNodeStore can be rather expensive
when there are old branch commits which were not merged.
> A commit that includes documents with old branch commits that have not been merged will
always attempt to set a collision marker on the commit root document for those changes.
> While it is difficult to tell whether a branch commit will be merged at some point, at
least those branch commits that were created before the most recent startup of a cluster node
cannot be merged. The collision handling logic could be improved to take the start time of
a cluster node into account.

This message was sent by Atlassian Jira

View raw message