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 2015/08/10 11:11:46 UTC
[jira] [Resolved] (OAK-1974) Fail fast on branch conflict
[ https://issues.apache.org/jira/browse/OAK-1974?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Marcel Reutegger resolved OAK-1974.
-----------------------------------
Resolution: Fixed
Fix Version/s: (was: 1.3.5)
1.3.4
Implemented in trunk: http://svn.apache.org/r1694997
> Fail fast on branch conflict
> ----------------------------
>
> Key: OAK-1974
> URL: https://issues.apache.org/jira/browse/OAK-1974
> Project: Jackrabbit Oak
> Issue Type: Improvement
> Components: core, mongomk
> Reporter: Marcel Reutegger
> Assignee: Marcel Reutegger
> Priority: Minor
> Labels: performance
> Fix For: 1.3.4
>
>
> The current MongoMK implementation performs retries when it runs into merge
> conflicts caused by collisions. It may be possible to resolve a conflict by resetting
> the branch back to the state as it was before the merge and re-run the commit hooks again.
> This helps if the conflict was introduced by a commit hook. At the moment the retries
> also happen when the conflict was introduced before the merge. In this case, a retry
> is useless and the commit should fail fast.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)