[
https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14386391#comment-14386391
]
Vikas Saurabh edited comment on OAK-2673 at 3/30/15 8:34 AM:
-------------------------------------------------------------
Thanks [~mreutegg] for reviewing. I'm uploading another
[patch|https://issues.apache.org/jira/secure/attachment/12708114/OAK-2673-Adding-resolution-of-same-name-conflicts-ad%28take2%29.patch]
with changes that you mentioned. Along with that I've added a small change in
{{SingleInstanceConflictUtility.generateConflict}} method for better reporting
of exception in case conflict wasn't expected.
was (Author: catholicon):
Thanks [~mreutegg] for reviewing. I'm uploading another
[patch|^OAK-2673-Adding-resolution-of-same-name-conflicts-ad(take2)] with
changes that you mentioned. Along with that I've added a small change in
{{SingleInstanceConflictUtility.generateConflict}} method for better reporting
of exception in case conflict wasn't expected.
> Resolve add-add, delete-delete merge conflict for empty hidden docs
> -------------------------------------------------------------------
>
> Key: OAK-2673
> URL: https://issues.apache.org/jira/browse/OAK-2673
> Project: Jackrabbit Oak
> Issue Type: Sub-task
> Components: mongomk
> Reporter: Vikas Saurabh
> Fix For: 1.4
>
> Attachments:
> OAK-2673-Adding-resolution-of-same-name-conflicts-ad(take2).patch,
> OAK-2673-HiddenNodeSameNameMergeConflict.patch
>
>
> While OAK-1550 is about general fix for resolving same node merge conflicts.
> But until general issue is fixed, we should special case for hidden nodes
> (e.g. index sub-tree).
> Discussed offline with [~mreutegg] and [~chetanm] about handling merge
> conflict for hidden nodes. Main concern to not resolve the conflict seemed to
> be observation (specifying/declaring what events reach which clients). For
> hidden nodes, observation isn't a concern. Along with that, in heavy write
> scenarios there are some cases (I'm aware of property index updates) which
> often cause conflicts -- thereby wasting some time during merge attempts.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
