[jira] [Commented] (OAK-943) Provide more details with CommitFailedException

["Chetan Mehrotra (JIRA)" <ji...@apache.org>]

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

Chetan Mehrotra commented on OAK-943:
-------------------------------------

The exception with patch looks like as shown below. 

* It would show the conflictType. 
* For conflict related to property it would show the old value and new value (our,theirs)
* While displaying property value it would ensure the output does not blowup the message (ignores binary,array and trim string)

{noformat}
Caused by: org.apache.jackrabbit.oak.api.CommitFailedException: OakState0001: Unresolved conflicts in /parentNode/subNode = {changeChangedProperty = {foo = {bar2,bar}}}
	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.failOnMergeConflict(ConflictValidator.java:83)
	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.propertyAdded(ConflictValidator.java:54)
	at org.apache.jackrabbit.oak.spi.commit.CompositeEditor.propertyAdded(CompositeEditor.java:83)
{noformat}
                
> Provide more details with CommitFailedException
> -----------------------------------------------
>
>                 Key: OAK-943
>                 URL: https://issues.apache.org/jira/browse/OAK-943
>             Project: Jackrabbit Oak
>          Issue Type: Improvement
>          Components: core
>    Affects Versions: 0.8
>            Reporter: Chetan Mehrotra
>            Priority: Minor
>         Attachments: OAK-943.patch
>
>
> Currently if a commit fails due to conflict it throws following exception
> {noformat}
> Caused by: org.apache.jackrabbit.oak.api.CommitFailedException: OakState0001: Unresolved conflicts in /
> 	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.failOnMergeConflict(ConflictValidator.java:82)
> 	at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.propertyChanged(ConflictValidator.java:59)
> 	at org.apache.jackrabbit.oak.spi.commit.CompositeEditor.propertyChanged(CompositeEditor.java:91)
> 	at org.apache.jackrabbit.oak.spi.commit.EditorDiff.propertyChanged(EditorDiff.java:93)
> 	at org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:355)
> 	at org.apache.jackrabbit.oak.spi.commit.EditorDiff.process(EditorDiff.java:52)
> {noformat}
> With this much information its hard to see the conflict details. To help in debugging such issues the exception message must include the conflict related information
> Discussion Thread - http://markmail.org/thread/4ipmyad6wwsy6th6

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira