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 ch...@apache.org on 2015/04/10 07:19:21 UTC
svn commit: r1672543 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugi...
Author: chetanm
Date: Fri Apr 10 05:19:20 2015
New Revision: 1672543
URL: http://svn.apache.org/r1672543
Log:
OAK-2673 - Resolve add-add, delete-delete merge conflict for empty hidden docs
Merge 1670705
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 05:19:20 2015
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1
628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,164195
0,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,1656427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,165
8470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666177,1666218,1666220,1666351-1666352,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669337,1669361,1669579,1669680,1670030,1670693,1671512,1671787,1672350,1672537
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231
,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1
628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,164195
0,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,1656427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,165
8470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666177,1666218,1666220,1666351-1666352,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669337,1669361,1669579,1669680,1670030,1670693,1670705,1671512,1671787,1672350,1672537
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1672543&r1=1672542&r2=1672543&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Fri Apr 10 05:19:20 2015
@@ -477,12 +477,12 @@ public class Commit {
}
String conflictMessage = null;
if (newestRev == null) {
- if (op.isDelete() || !op.isNew()) {
+ if ((op.isDelete() || !op.isNew()) && isConflicting(before, op)) {
conflictMessage = "The node " +
op.getId() + " does not exist or is already deleted";
}
} else {
- if (op.isNew()) {
+ if (op.isNew() && isConflicting(before, op)) {
conflictMessage = "The node " +
op.getId() + " was already added in revision\n" +
newestRev;
@@ -547,7 +547,8 @@ public class Commit {
// or document did not exist before
return false;
}
- return doc.isConflicting(op, baseRevision, revision, nodeStore);
+ return doc.isConflicting(op, baseRevision, revision, nodeStore,
+ nodeStore.getEnableConcurrentAddRemove());
}
/**
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1672543&r1=1672542&r2=1672543&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Fri Apr 10 05:19:20 2015
@@ -136,6 +136,13 @@ public final class DocumentNodeStore
private static final boolean ENABLE_BACKGROUND_OPS = Boolean.parseBoolean(System.getProperty("oak.documentMK.backgroundOps", "true"));
/**
+ * Feature flag to enable concurrent add/remove operations of hidden empty
+ * nodes. See OAK-2673.
+ */
+ private boolean enableConcurrentAddRemove =
+ Boolean.getBoolean("oak.enableConcurrentAddRemove");
+
+ /**
* How long to remember the relative order of old revision of all cluster
* nodes, in milliseconds. The default is one hour.
*/
@@ -647,6 +654,14 @@ public final class DocumentNodeStore
return maxBackOffMillis;
}
+ void setEnableConcurrentAddRemove(boolean b) {
+ enableConcurrentAddRemove = b;
+ }
+
+ boolean getEnableConcurrentAddRemove() {
+ return enableConcurrentAddRemove;
+ }
+
@CheckForNull
public ClusterNodeInfo getClusterInfo() {
return clusterNodeInfo;
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1672543&r1=1672542&r2=1672543&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Fri Apr 10 05:19:20 2015
@@ -936,22 +936,30 @@ public final class NodeDocument extends
* @param baseRevision the base revision for the update operation.
* @param commitRevision the commit revision of the update operation.
* @param context the revision context.
+ * @param enableConcurrentAddRemove feature flag for OAK-2673.
* @return <code>true</code> if conflicting, <code>false</code> otherwise.
*/
boolean isConflicting(@Nonnull UpdateOp op,
- @Nonnull Revision baseRevision,
- @Nonnull Revision commitRevision,
- @Nonnull RevisionContext context) {
+ @Nonnull Revision baseRevision,
+ @Nonnull Revision commitRevision,
+ @Nonnull RevisionContext context,
+ boolean enableConcurrentAddRemove) {
// did existence of node change after baseRevision?
// only check local deleted map, which contains the most
// recent values
Map<Revision, String> deleted = getLocalDeleted();
+ boolean allowConflictingDeleteChange =
+ enableConcurrentAddRemove && allowConflictingDeleteChange(op);
for (Map.Entry<Revision, String> entry : deleted.entrySet()) {
if (entry.getKey().equals(commitRevision)) {
continue;
}
+
if (isRevisionNewer(context, entry.getKey(), baseRevision)) {
- return true;
+ boolean newerDeleted = Boolean.parseBoolean(entry.getValue());
+ if (!allowConflictingDeleteChange || op.isDelete() != newerDeleted) {
+ return true;
+ }
}
}
@@ -960,7 +968,7 @@ public final class NodeDocument extends
continue;
}
String name = entry.getKey().getName();
- if (DELETED.equals(name)) {
+ if (DELETED.equals(name) && !allowConflictingDeleteChange) {
// existence of node changed, this always conflicts with
// any other concurrent change
return true;
@@ -982,6 +990,55 @@ public final class NodeDocument extends
}
/**
+ * Utility method to check if {@code op} can be allowed to change
+ * {@link #DELETED} property. Basic idea is that a change in
+ * {@link #DELETED} property should be consistent if final value is same
+ * and there are no observation semantic change. Thus, this method tries to
+ * be very conservative and allows delete iff:
+ * <ul>
+ * <li>{@code doc} represents and internal path</li>
+ * <li>{@code op} represents an add or delete operation</li>
+ * <li>{@code op} doesn't change add/delete any exposed property</li>
+ * <li>{@code doc} doesn't have any exposed property</li>
+ * </ul>
+ * <i>
+ * Note: This method is a broad level check if we can allow such conflict
+ * resolution. Actual cases, like allow-delete-delete, allow-add-add wrt to
+ * revision are not handled here.
+ * </i>
+ * @param op {@link UpdateOp} instance having changes to check {@code doc} against
+ * @return if conflicting change in {@link #DELETED} property is allowed
+ */
+ private boolean allowConflictingDeleteChange(UpdateOp op) {
+ String path = getPath();
+ if (!Utils.isHiddenPath(path)) {
+ return false;
+ }
+
+ if (!op.isNew() && !op.isDelete()) {
+ return false;//only handle added/delete operations
+ }
+
+ for (Key opKey : op.getChanges().keySet()) {
+ String name = opKey.getName();
+ if (Utils.isPropertyName(name)) {
+ return false; //only handle changes to internal properties
+ }
+ }
+
+ // Only look at local data ...
+ // even remotely updated properties should have an entry (although invisible)
+ // by the time we are looking for conflicts
+ for (String dataKey : keySet()) {
+ if (Utils.isPropertyName(dataKey)) {
+ return false; //only handle changes to internal properties
+ }
+ }
+
+ return true;
+ }
+
+ /**
* Returns update operations to split this document. The implementation may
* decide to not return any operations if no splitting is required.
*
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1672543&r1=1672542&r2=1672543&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Fri Apr 10 05:19:20 2015
@@ -545,4 +545,11 @@ public class Utils {
};
}
+ /**
+ * @return if {@code path} represent oak's internal path. That is, a path
+ * element start with a colon.
+ */
+ public static boolean isHiddenPath(@Nonnull String path) {
+ return path.contains("/:");
+ }
}
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1672543&r1=1672542&r2=1672543&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Fri Apr 10 05:19:20 2015
@@ -53,10 +53,17 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import com.google.common.base.Throwables;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.kernel.KernelNodeState;
+import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler;
+import org.apache.jackrabbit.oak.plugins.commit.ConflictHook;
+import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.TimingDocumentStoreWrapper;
@@ -1140,6 +1147,430 @@ public class DocumentNodeStoreTest {
store.dispose();
}
+ @Test
+ public void mergeInternalDocAcrossCluster() throws Exception {
+ MemoryDocumentStore docStore = new MemoryDocumentStore();
+ final DocumentNodeStore store1 = new DocumentMK.Builder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(1)
+ .getNodeStore();
+ store1.setEnableConcurrentAddRemove(true);
+ final DocumentNodeStore store2 = new DocumentMK.Builder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(2)
+ .getNodeStore();
+ store2.setEnableConcurrentAddRemove(true);
+ try {
+
+ NodeState root;
+ NodeBuilder builder;
+
+ //Prepare repo
+ root = store1.getRoot();
+ builder = root.builder();
+ builder.child(":hidden").child("deleteDeleted");
+ builder.child(":hidden").child("deleteChanged");
+ builder.child(":hidden").child("changeDeleted");
+ merge(store1, builder);
+ store1.runBackgroundOperations();
+ store2.runBackgroundOperations();
+
+ //Changes in store1
+ root = store1.getRoot();
+ builder = root.builder();
+ builder.child("visible");
+ builder.child(":hidden").child("b");
+ builder.child(":hidden").child("deleteDeleted").remove();
+ builder.child(":hidden").child("changeDeleted").remove();
+ builder.child(":hidden").child("deleteChanged").setProperty("foo", "bar");
+ builder.child(":dynHidden").child("c");
+ builder.child(":dynHidden").child("childWithProp").setProperty("foo", "bar");
+ merge(store1, builder);
+
+ //Changes in store2
+
+ //root would hold reference to store2 root state after initial repo initialization
+ root = store2.getRoot();
+
+ //The hidden node itself should be creatable across cluster concurrently
+ builder = root.builder();
+ builder.child(":dynHidden");
+ merge(store2, builder);
+
+ //Children of hidden node should be creatable across cluster concurrently
+ builder = root.builder();
+ builder.child(":hidden").child("b");
+ builder.child(":dynHidden").child("c");
+ merge(store2, builder);
+
+ //Deleted deleted conflict of internal node should work across cluster concurrently
+ builder = root.builder();
+ builder.child(":hidden").child("deleteDeleted").remove();
+ merge(store2, builder);
+
+ //Avoid repeated merge tries ... fail early
+ store2.setMaxBackOffMillis(0);
+
+ boolean commitFailed = false;
+ try {
+ builder = root.builder();
+ builder.child("visible");
+ merge(store2, builder);
+ } catch (CommitFailedException cfe) {
+ commitFailed = true;
+ }
+ assertTrue("Concurrent creation of visible node across cluster must fail", commitFailed);
+
+ commitFailed = false;
+ try {
+ builder = root.builder();
+ builder.child(":dynHidden").child("childWithProp").setProperty("foo", "bar");
+ merge(store2, builder);
+ } catch (CommitFailedException cfe) {
+ commitFailed = true;
+ }
+ assertTrue("Concurrent creation of hidden node with properties across cluster must fail", commitFailed);
+
+ commitFailed = false;
+ try {
+ builder = root.builder();
+ builder.child(":hidden").child("deleteChanged").remove();
+ merge(store2, builder);
+ } catch (CommitFailedException cfe) {
+ commitFailed = true;
+ }
+ assertTrue("Delete changed merge across cluster must fail even under hidden tree", commitFailed);
+
+ commitFailed = false;
+ try {
+ builder = root.builder();
+ builder.child(":hidden").child("changeDeleted").setProperty("foo", "bar");
+ merge(store2, builder);
+ } catch (CommitFailedException cfe) {
+ commitFailed = true;
+ }
+ assertTrue("Change deleted merge across cluster must fail even under hidden tree", commitFailed);
+ } finally {
+ store2.dispose();
+ store1.dispose();
+ }
+ }
+
+ @Test
+ public void mergeDeleteDeleteEmptyInternalDoc() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child(":a");
+ builder.child(":b");
+ merge(store, builder);
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1"}, new String[]{":a"},
+ new String[]{":2"}, new String[]{":b"},
+ new String[]{":3"}, new String[]{":a", ":b"},
+ true, "Delete-delete merge conflicts for internal docs should be resolved");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeDeleteDeleteNonEmptyInternalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child(":a").setProperty("foo", "bar");
+ builder.child(":b");
+ merge(store, builder);
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1"}, new String[]{":a"},
+ new String[]{":2"}, new String[]{":b"},
+ new String[]{":3"}, new String[]{":a", ":b"},
+ false, "Delete-delete merge conflicts for non-empty internal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeDeleteDeleteNormalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child("a");
+ builder.child("b");
+ merge(store, builder);
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1"}, new String[]{"a"},
+ new String[]{":2"}, new String[]{"b"},
+ new String[]{":3"}, new String[]{"a", "b"},
+ false, "Delete-delete merge conflicts for normal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeAddAddEmptyInternalDoc() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1", ":a"}, new String[]{},
+ new String[]{":2", ":b"}, new String[]{},
+ new String[]{":3", ":a", ":b"}, new String[]{},
+ true, "Add-add merge conflicts for internal docs should be resolvable");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeAddAddNonEmptyInternalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1", ":a"}, new String[]{}, true,
+ new String[]{":2", ":b"}, new String[]{}, true,
+ new String[]{":3", ":a", ":b"}, new String[]{}, false,
+ false, "Add-add merge conflicts for non empty internal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeAddAddNormalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1", "a"}, new String[]{},
+ new String[]{":2", "b"}, new String[]{},
+ new String[]{":3", "a", "b"}, new String[]{},
+ false, "Add-add merge conflicts for normal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeDeleteChangedInternalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child(":a");
+ builder.child(":b");
+ merge(store, builder);
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1", ":a"}, new String[]{}, true,
+ new String[]{":2", ":b"}, new String[]{}, true,
+ new String[]{":3"}, new String[]{":a", ":b"}, false,
+ false, "Delete changed merge conflicts for internal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ @Test
+ public void mergeChangeDeletedInternalDocShouldFail() throws Exception {
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
+ store.setEnableConcurrentAddRemove(true);
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child(":a");
+ builder.child(":b");
+ merge(store, builder);
+ SingleInstanceConflictUtility.generateConflict(store,
+ new String[]{":1"}, new String[]{":a"}, false,
+ new String[]{":2"}, new String[]{":b"}, false,
+ new String[]{":3", ":a", ":b"}, new String[]{}, true,
+ false, "Change deleted merge conflicts for internal docs should fail");
+ } finally {
+ store.dispose();
+ }
+ }
+
+ /**
+ * Utility class that eases creating single cluster id merge conflicts. The two methods:
+ * <ul>
+ * <li>{@link #generateConflict(DocumentNodeStore, String[], String[], String[], String[], String[], String[], boolean, String)}</li>
+ * <li>{@link #generateConflict(DocumentNodeStore, String[], String[], boolean, String[], String[], boolean, String[], String[], boolean, boolean, String)}</li>
+ * </ul>
+ * can be passed descriptions of modifications required to create conflict. These methods would also take
+ * expectation of successful/failure of resolution of merge conflict. In case of failure of that assertion, these
+ * methods would mark the test to fail.
+ */
+ private static class SingleInstanceConflictUtility {
+ /**
+ * Wrapper of {@link #generateConflict(DocumentNodeStore, String[], String[], boolean, String[], String[], boolean, String[], String[], boolean, boolean, String)}
+ * with value of {@code change1, change2, and change3} as {@code false}
+ */
+ public static void generateConflict(final DocumentNodeStore store,
+ String [] normalAddChildren1, String [] normalRemoveChildren1,
+ String [] normalAddChildren2, String [] normalRemoveChildren2,
+ String [] conflictingAddChildren3, String [] conflictingRemoveChildren3,
+ boolean shouldMerge, String assertMessage)
+ throws CommitFailedException, InterruptedException {
+ generateConflict(store,
+ normalAddChildren1, normalRemoveChildren1, false,
+ normalAddChildren2, normalRemoveChildren2, false,
+ conflictingAddChildren3, conflictingRemoveChildren3, false,
+ shouldMerge, assertMessage
+ );
+ }
+
+ /**
+ * This method takes 3 descriptions of changes for conflict to happen. Each description has a set of
+ * {@code AddChildren}, {@code RemoveChildren}, and {@code change} parameters. {@code AddChidren} is an
+ * array of children to be added, {@code RemoveChildren} is an array of children to be removed, and
+ * {@code change} controls if a property (hard-coded to {@code @foo=bar}) needs to be set on children
+ * that are part of {@code AddChildren} array.
+ * The changes should be such that set1 changes and set2 changes should be safe. The conflict should be
+ * represented by changes in set3 -- and the conflict should exist against both set1 and set2.
+ * These 3 description are then used to create changes on 3 threads in such a way that by the time thread3
+ * gets around to persist its changes, there are more revisions which get committed. In case the conflict
+ * couldn't be resolved, thread3 would report an exception which is tested
+ * against {@code mergeable}.
+ * @throws InterruptedException
+ */
+ public static void generateConflict(final DocumentNodeStore store,
+ String [] normalAddChildren1, String [] normalRemoveChildren1, boolean change1,
+ String [] normalAddChildren2, String [] normalRemoveChildren2, boolean change2,
+ String [] conflictingAddChildren3, String [] conflictingRemoveChildren3, boolean change3,
+ boolean mergeable, String assertMessage)
+ throws InterruptedException {
+ //This would result in 0 retries... 1 rebase would happen and we'd control it :D
+ store.setMaxBackOffMillis(0);
+
+ SingleInstanceConflictUtility thread1 = new SingleInstanceConflictUtility();
+ SingleInstanceConflictUtility thread3 = new SingleInstanceConflictUtility();
+ SingleInstanceConflictUtility thread2 = new SingleInstanceConflictUtility();
+
+ thread1.startMerge(store, normalAddChildren1, normalRemoveChildren1, change1);
+ thread2.startMerge(store, conflictingAddChildren3, conflictingRemoveChildren3, change3);
+
+ thread1.join();
+ thread2.waitForNextMerge();
+
+ thread3.startMerge(store, normalAddChildren2, normalRemoveChildren2, change2);
+ thread3.join();
+
+ thread2.join();
+
+ assertNull("There shouldn't be any exception for thread1", thread1.getException());
+ assertNull("There shouldn't be any exception for thread3", thread3.getException());
+
+ CommitFailedException cfe = thread2.getException();
+ if (mergeable != (cfe == null)) {
+ StringBuffer message = new StringBuffer(assertMessage);
+ if (cfe != null) {
+ message.append("\n");
+ message.append(Throwables.getStackTraceAsString(cfe));
+ }
+ fail(message.toString());
+ }
+ }
+
+ private Thread merger;
+ private CommitFailedException mergeException = null;
+
+ private boolean dontBlock;
+ private final Semaphore controller = new Semaphore(0);
+ private final Semaphore controllee = new Semaphore(0);
+
+ private void startMerge(final NodeStore store,
+ @Nonnull String [] addChildren, @Nonnull String [] removeChildren, boolean change) {
+ startMerge(store, null, addChildren, removeChildren, change);
+ }
+
+ private void startMerge(final NodeStore store, final CommitHook hook,
+ @Nonnull String [] addChildren, @Nonnull String [] removeChildren, boolean change) {
+ setDontBlock(false);
+
+ //our controller is controllee for merge thread (and vice versa)
+ merger = createMergeThread(store, hook, controllee, controller, addChildren, removeChildren, change);
+ merger.start();
+ controllee.acquireUninterruptibly();//wait for merge thread to get to blocking hook
+ }
+
+ private void waitForNextMerge() throws InterruptedException{
+ controller.release();
+ controllee.tryAcquire(2, TimeUnit.SECONDS);
+ }
+ private void unblock() {
+ setDontBlock(true);
+ controller.release();
+ }
+ private void join() throws InterruptedException {
+ unblock();
+ merger.join();
+ }
+
+ private synchronized void setDontBlock(boolean dontBlock) {
+ this.dontBlock = dontBlock;
+ }
+ private synchronized boolean getDontBlock() {
+ return dontBlock;
+ }
+ private CommitFailedException getException() {
+ return mergeException;
+ }
+
+ private Thread createMergeThread(final NodeStore store, final CommitHook hook,
+ final Semaphore controller, final Semaphore controllee,
+ @Nonnull final String [] addChildren, @Nonnull final String [] removeChildren,
+ final boolean change) {
+ return new Thread(new Runnable() {
+ @Override
+ public void run() {
+ final CommitHook blockingHook = new CommitHook() {
+ @Nonnull
+ @Override
+ public NodeState processCommit(NodeState before, NodeState after, CommitInfo info)
+ throws CommitFailedException {
+ controller.release();
+ if(!getDontBlock()) {
+ controllee.acquireUninterruptibly();
+ }
+ return after;
+ }
+ };
+
+ try {
+ NodeBuilder builder = store.getRoot().builder();
+ for (String child : addChildren) {
+ if (change) {
+ builder.child(child).setProperty("foo", "bar");
+ } else {
+ builder.child(child);
+ }
+ }
+ for (String child : removeChildren) {
+ builder.child(child).remove();
+ }
+
+ List<CommitHook> hookList = new ArrayList<CommitHook>();
+ if(hook != null) {
+ hookList.add(hook);
+ }
+ hookList.add(blockingHook);
+ hookList.add(new ConflictHook(new AnnotatingConflictHandler()));
+ hookList.add(new EditorHook(new ConflictValidatorProvider()));
+ store.merge(builder, CompositeHook.compose(hookList), CommitInfo.EMPTY);
+ } catch (CommitFailedException cfe) {
+ mergeException = cfe;
+ }
+ }
+ });
+ }
+ }
+
// OAK-2642
@Test
public void dispose() throws CommitFailedException, InterruptedException {