[
https://issues.apache.org/jira/browse/OAK-8623?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16944389#comment-16944389
]
Julian Reschke edited comment on OAK-8623 at 10/4/19 12:40 PM:
---------------------------------------------------------------
I see frequent test failures in my local build:
{noformat}
[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!
java.lang.AssertionError:
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)
{noformat}
or
{noformat}
[INFO] Running org.apache.jackrabbit.oak.plugins.document.CollisionTest
[ERROR] Tests run: 6, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 0.067 s
<<< FAILURE! - in org.apache.jackrabbit.oak.plugins.document.CollisionTest
[ERROR]
collisionOnForeignOrphanedBranchAfterRestart(org.apache.jackrabbit.oak.plugins.document.CollisionTest)
Time elapsed: 0.034 s <<< FAILURE!
java.lang.AssertionError:
Expected: an empty collection
but: <[r16d96bfee4e-1-1]>
at
org.apache.jackrabbit.oak.plugins.document.CollisionTest.assertNoCollisions(CollisionTest.java:359)
at
org.apache.jackrabbit.oak.plugins.document.CollisionTest.collisionOnForeignOrphanedBranchAfterRestart(CollisionTest.java:299)
[ERROR]
collisionWithBranchOnForeignOrphanedBranchAfterRestart(org.apache.jackrabbit.oak.plugins.document.CollisionTest)
Time elapsed: 0.01 s <<< FAILURE!
java.lang.AssertionError:
Expected: an empty collection
but: <[r16d96bfee6d-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)
{noformat}
was (Author: reschke):
I see frequent test failures in my local build:
{noformat}
[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!
java.lang.AssertionError:
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)
{noformat}
> 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
(v8.3.4#803005)
