[OAK-3171] Conflict Exception logs path information only on DEBUG

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.0.17, 1.0.18, 1.2.3, 1.3.3
• Fix Version/s: 1.0.19, 1.2.4, 1.3.4, 1.4
• Component/s: core
• Assignee: Alex Deparvu
• Reporter: Alex Deparvu
• Created: 31/Jul/15 11:54
• Updated: 02/Mar/16 12:00
• Resolved: 04/Aug/15 09:28

Description

Post OAK-3057, the Conflict Exception is not logging path information, unless DEBUG logs are enabled. This is an unfortunate regression and needs to be fixed.

Caused by: org.apache.jackrabbit.oak.api.CommitFailedException: OakState0001: Unresolved conflicts in null
        at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.failOnMergeConflict(ConflictValidator.java:127)
        at org.apache.jackrabbit.oak.plugins.commit.ConflictValidator.propertyChanged(ConflictValidator.java:102)
        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:378)
        at org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)
        at org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:396)
        at org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)
        at org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.compareAgainstBaseState(ModifiedNodeState.java:396)
        at org.apache.jackrabbit.oak.spi.commit.EditorDiff.childNodeChanged(EditorDiff.java:148)

Issue Links

• supercedes: OAK-3057 Simplify debugging conflict related errors