You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/08/04 10:34:11 UTC
svn commit: r1694011 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Author: alexparvulescu
Date: Tue Aug 4 08:34:10 2015
New Revision: 1694011
URL: http://svn.apache.org/r1694011
Log:
OAK-3171 Conflict Exception logs path information only on DEBUG
- merged r1694007
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 4 08:34:10 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java?rev=1694011&r1=1694010&r2=1694011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java Tue Aug 4 08:34:10 2015
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.commit;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
+import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.MIX_REP_MERGE_CONFLICT;
import org.apache.jackrabbit.JcrConstants;
@@ -24,7 +25,6 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.spi.commit.DefaultValidator;
import org.apache.jackrabbit.oak.spi.commit.Validator;
@@ -60,23 +60,11 @@ public class ConflictValidator extends D
}
ConflictValidator() {
- if (log.isDebugEnabled()) {
- this.path = "/";
- } else {
- this.path = null;
- }
+ this.path = "/";
}
private ConflictValidator(String path, String name) {
- if (path != null) {
- this.path = PathUtils.concat(path, name);
- } else {
- this.path = null;
- }
- }
-
- private boolean isLogEnabled() {
- return path != null;
+ this.path = concat(path, name);
}
@Override
@@ -130,7 +118,7 @@ public class ConflictValidator extends D
//Conflict details are not made part of ExceptionMessage instead they are
//logged. This to avoid exposing property details to the caller as it might not have
//permission to access it
- if (isLogEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(getConflictMessage(), ex);
}
throw ex;
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java?rev=1694011&r1=1694010&r2=1694011&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java Tue Aug 4 08:34:10 2015
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import static org.junit.matchers.JUnitMatchers.containsString;
-import java.util.List;
import java.util.Set;
import javax.jcr.InvalidItemStateException;
@@ -32,13 +31,12 @@ import javax.jcr.Session;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Sets;
-
import ch.qos.logback.classic.Level;
+import com.google.common.collect.Sets;
+
public class ConflictResolutionTest extends AbstractRepositoryTest {
// TODO add tests for all ConflictType types to observe generated logs
@@ -56,50 +54,33 @@ public class ConflictResolutionTest exte
super(fixture);
}
- @Before
- public void setup() throws RepositoryException {
- logMergingNodeStateDiff.starting();
- logConflictValidator.starting();
- }
-
@After
public void after() {
super.logout();
- logMergingNodeStateDiff.finished();
- logConflictValidator.finished();
}
@Test
public void deleteChangedNode() throws RepositoryException {
- getAdminSession().getRootNode().addNode("node").addNode("jcr:content")
- .addNode("metadata");
- getAdminSession().save();
+ // first INFO level
+ deleteChangedNodeOps("node0");
- Session session1 = createAdminSession();
- Session session2 = createAdminSession();
+ // DEBUG level
+ Set<String> mnsdLogs;
+ Set<String> cvLogs;
try {
- session1.getNode("/node/jcr:content").remove();
- session2.getNode("/node/jcr:content/metadata").setProperty(
- "updated", "myself");
- session2.save();
- try {
- session1.save();
- fail("Expected InvalidItemStateException");
- } catch (InvalidItemStateException expected) {
- assertThat(
- "Expecting 'Unresolved conflicts in /node'",
- expected.getMessage(),
- containsString("OakState0001: Unresolved conflicts in /node"));
- }
+ logMergingNodeStateDiff.starting();
+ logConflictValidator.starting();
+ deleteChangedNodeOps("node1");
} finally {
- session1.logout();
- session2.logout();
+ mnsdLogs = Sets.newHashSet(logMergingNodeStateDiff.getLogs());
+ cvLogs = Sets.newHashSet(logConflictValidator.getLogs());
+ logMergingNodeStateDiff.finished();
+ logConflictValidator.finished();
}
// MergingNodeStateDif debug: NodeConflictHandler<DELETE_CHANGED_NODE>
// resolved conflict of type DELETE_CHANGED_NODE with resolution THEIRS
// on node jcr:content, conflict trace ^"/metadata/updated":"myself"
- Set<String> mnsdLogs = Sets.newHashSet(logMergingNodeStateDiff.getLogs());
assertTrue(mnsdLogs.size() == 1);
assertThat(
"MergingNodeStateDiff log message must contain a reference to the handler",
@@ -115,12 +96,38 @@ public class ConflictResolutionTest exte
containsString("^\"/metadata/updated\":\"myself\"]"));
// ConflictValidator debug: Commit failed due to unresolved
- // conflicts in /node = {deleteChangedNode = {jcr:content}}
- Set<String> cvLogs = Sets.newHashSet(logConflictValidator.getLogs());
+ // conflicts in /node1 = {deleteChangedNode = {jcr:content}}
assertTrue(cvLogs.size() == 1);
assertThat(
"ConflictValidator log message must contain a reference to the path",
cvLogs.toString(),
- containsString("/node = {deleteChangedNode = {jcr:content}}"));
+ containsString("/node1 = {deleteChangedNode = {jcr:content}}"));
+ }
+
+ private void deleteChangedNodeOps(String node) throws RepositoryException {
+ getAdminSession().getRootNode().addNode(node).addNode("jcr:content")
+ .addNode("metadata");
+ getAdminSession().save();
+
+ Session session1 = createAdminSession();
+ Session session2 = createAdminSession();
+ try {
+ session1.getNode("/"+node+"/jcr:content").remove();
+ session2.getNode("/"+node+"/jcr:content/metadata").setProperty(
+ "updated", "myself");
+ session2.save();
+ try {
+ session1.save();
+ fail("Expected InvalidItemStateException");
+ } catch (InvalidItemStateException expected) {
+ assertThat(
+ "Expecting 'Unresolved conflicts in /"+node+"'",
+ expected.getMessage(),
+ containsString("OakState0001: Unresolved conflicts in /"+node+""));
+ }
+ } finally {
+ session1.logout();
+ session2.logout();
+ }
}
}