Author: mreutegg
Date: Wed Sep 9 12:28:01 2015
New Revision: 1701987
URL: http://svn.apache.org/r1701987
Log:
OAK-2929: Parent of unseen children must not be removable
Merged revisions 1701810,1701955 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 9 12:28:01 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,1673713,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,1681955,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,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701814,1701948,1701959
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,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,1681955,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,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700571,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1701987&r1=1701986&r2=1701987&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Wed Sep 9 12:28:01 2015
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -36,7 +37,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
import com.google.common.collect.Queues;
import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -57,6 +57,7 @@ import com.google.common.collect.Sets;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
+import static java.util.Collections.reverseOrder;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static
org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator.REVERSE;
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
@@ -697,11 +698,11 @@ public final class NodeDocument extends
Revision newestRev = null;
// check local commits first
- SortedMap<Revision, String> revisions = getLocalRevisions();
- SortedMap<Revision, String> commitRoots = getLocalCommitRoot();
- Iterator<Revision> it = filter(Iterables.mergeSorted(
- ImmutableList.of(revisions.keySet(), commitRoots.keySet()),
- revisions.comparator()), predicate).iterator();
+ Comparator<Revision> comp =
reverseOrder(context.getRevisionComparator());
+ SortedSet<Revision> revisions = Sets.newTreeSet(comp);
+ revisions.addAll(getLocalRevisions().keySet());
+ revisions.addAll(getLocalCommitRoot().keySet());
+ Iterator<Revision> it = filter(revisions, predicate).iterator();
if (it.hasNext()) {
newestRev = it.next();
} else {
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1701987&r1=1701986&r2=1701987&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Wed Sep 9 12:28:01 2015
@@ -41,6 +41,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ArrayBlockingQueue;
@@ -60,6 +61,7 @@ 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.Maps;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -1062,6 +1064,182 @@ public class DocumentNodeStoreTest {
assertTrue("Existing children should be reported as such",
existingChild.exists());
}
+ // OAK-2929
+ @Test
+ public void conflictDetectionWithClockDifference() throws Exception {
+ MemoryDocumentStore store = new MemoryDocumentStore();
+ long now = System.currentTimeMillis();
+ Clock c1 = new Clock.Virtual();
+ c1.waitUntil(now);
+ Revision.setClock(c1);
+ DocumentNodeStore ns1 = builderProvider.newBuilder().clock(c1)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("node");
+ merge(ns1, b1);
+ // make /node visible
+ ns1.runBackgroundOperations();
+
+ Revision.resetClockToDefault();
+ Clock c2 = new Clock.Virtual();
+ // c2 is five seconds ahead
+ c2.waitUntil(now + 5000);
+ Revision.setClock(c2);
+
+ DocumentNodeStore ns2 = builderProvider.newBuilder().clock(c2)
+ .setDocumentStore(store).setAsyncDelay(0).getNodeStore();
+ // ns2 sees /node
+ assertTrue(ns2.getRoot().hasChildNode("node"));
+
+ // add a child /node/foo
+ NodeBuilder b2 = ns2.getRoot().builder();
+ b2.child("node").child("foo");
+ merge(ns2, b2);
+ // make /node/foo visible
+ ns2.runBackgroundOperations();
+
+ Revision.resetClockToDefault();
+ Revision.setClock(c1);
+ ns1.runBackgroundOperations();
+ b1 = ns1.getRoot().builder();
+ // ns1 sees /node/foo as well
+ assertTrue(b1.getChildNode("node").hasChildNode("foo"));
+ // remove both /node and /node/foo
+ b1.child("node").remove();
+ merge(ns1, b1);
+
+ Revision.resetClockToDefault();
+ Revision.setClock(c2);
+ b2 = ns2.getRoot().builder();
+ b2.child("node").child("bar");
+ try {
+ merge(ns2, b2);
+ // must not be able to add another child node
+ fail("must fail with CommitFailedException");
+ } catch (CommitFailedException e) {
+ // expected
+ }
+ }
+
+ // OAK-2929
+ @Test
+ public void parentWithUnseenChildrenMustNotBeDeleted() throws Exception {
+ final MemoryDocumentStore docStore = new MemoryDocumentStore();
+ final DocumentNodeStore store1 = builderProvider.newBuilder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(1)
+ .getNodeStore();
+ store1.setEnableConcurrentAddRemove(true);
+ final DocumentNodeStore store2 = builderProvider.newBuilder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(2)
+ .getNodeStore();
+ store2.setEnableConcurrentAddRemove(true);
+
+ NodeBuilder builder = store1.getRoot().builder();
+ builder.child(":hidden");
+ merge(store1, builder);
+
+ store1.runBackgroundOperations();
+ store2.runBackgroundOperations();
+
+ builder = store1.getRoot().builder();
+ builder.child(":hidden").child("parent").child("node1");
+ merge(store1, builder);
+
+ builder = store2.getRoot().builder();
+ builder.child(":hidden").child("parent").child("node2");
+ merge(store2, builder);
+
+ //Test 1 - parent shouldn't be removable if order of operation is:
+ //# N1 and N2 know about /:hidden
+ //# N1->create(/:hidden/parent/node1)
+ //# N2->create(/:hidden/parent/node2)
+ //# N1->remove(/:hidden/parent)
+ builder = store1.getRoot().builder();
+ builder.child(":hidden").child("parent").remove();
+ try {
+ merge(store1, builder);
+ fail("parent node of unseen children must not get deleted");
+ } catch (CommitFailedException cfe) {
+ //this merge should fail -- but our real check is done by
asserting that parent remains intact
+ }
+
+ String parentPath = "/:hidden/parent";
+ NodeDocument parentDoc = docStore.find(Collection.NODES,
Utils.getIdFromPath(parentPath));
+ assertFalse("parent node of unseen children must not get deleted",
+ isDocDeleted(parentDoc, store1.getRevisionComparator()));
+
+ //Test 2 - parent shouldn't be removable if order of operation is:
+ //# N1 and N2 know about /:hidden
+ //# N1->create(/:hidden/parent/node1)
+ //# N2->create(/:hidden/parent/node2)
+ //# N2->remove(/:hidden/parent)
+ builder = store2.getRoot().builder();
+ builder.child(":hidden").child("parent").remove();
+ try {
+ merge(store2, builder);
+ fail("parent node of unseen children must not get deleted");
+ } catch (CommitFailedException cfe) {
+ //this merge should fail -- but our real check is done by
asserting that parent remains intact
+ }
+
+ parentDoc = docStore.find(Collection.NODES,
Utils.getIdFromPath(parentPath));
+ assertFalse("parent node of unseen children must not get deleted",
+ isDocDeleted(parentDoc, store2.getRevisionComparator()));
+
+ store1.runBackgroundOperations();
+ store2.runBackgroundOperations();
+ builder = store1.getRoot().builder();
+ builder.child(":hidden").child("parent").remove();
+ builder.child(":hidden").child("parent1");
+ store1.runBackgroundOperations();
+ store2.runBackgroundOperations();
+
+ builder = store1.getRoot().builder();
+ builder.child(":hidden").child("parent1").child("node1");
+ merge(store1, builder);
+
+ builder = store2.getRoot().builder();
+ builder.child(":hidden").child("parent1").child("node2");
+ merge(store2, builder);
+
+ //Test 3 - parent shouldn't be removable if order of operation is:
+ //# N1 and N2 know about /:hidden/parent1
+ //# N1->create(/:hidden/parent1/node1)
+ //# N2->create(/:hidden/parent1/node2)
+ //# N1->remove(/:hidden/parent1)
+ builder = store1.getRoot().builder();
+ builder.child(":hidden").child("parent1").remove();
+ try {
+ merge(store1, builder);
+ } catch (CommitFailedException cfe) {
+ //this merge should fail -- but our real check is done by
asserting that parent remains intact
+ }
+
+ parentPath = "/:hidden/parent1";
+ parentDoc = docStore.find(Collection.NODES,
Utils.getIdFromPath(parentPath));
+ assertFalse("parent node of unseen children must not get deleted",
+ isDocDeleted(parentDoc, store1.getRevisionComparator()));
+
+ //Test 4 - parent shouldn't be removable if order of operation is:
+ //# N1 and N2 know about /:hidden/parent1
+ //# N1->create(/:hidden/parent1/node1)
+ //# N2->create(/:hidden/parent1/node2)
+ //# N2->remove(/:hidden/parent1)
+ builder = store2.getRoot().builder();
+ builder.child(":hidden").child("parent1").remove();
+ try {
+ merge(store2, builder);
+ } catch (CommitFailedException cfe) {
+ //this merge should fail -- but our real check is done by
asserting that parent remains intact
+ }
+
+ parentDoc = docStore.find(Collection.NODES,
Utils.getIdFromPath(parentPath));
+ assertFalse("parent node of unseen children must not get deleted",
+ isDocDeleted(parentDoc, store2.getRevisionComparator()));
+ }
+
@Test
public void mergeInternalDocAcrossCluster() throws Exception {
MemoryDocumentStore docStore = new MemoryDocumentStore();
@@ -1106,12 +1284,7 @@ public class DocumentNodeStoreTest {
//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
+ //The hidden node and children should be creatable across cluster
concurrently
builder = root.builder();
builder.child(":hidden").child("b");
builder.child(":dynHidden").child("c");
@@ -1898,4 +2071,24 @@ public class DocumentNodeStoreTest {
}
}
}
+
+ /**
+ * @param doc the document to be tested
+ * @return latest committed value of _deleted map
+ */
+ private boolean isDocDeleted(NodeDocument doc,
+ Comparator<Revision> comparator) {
+ boolean latestDeleted = false;
+ SortedMap<Revision, String> localDeleted = Maps.newTreeMap(
+ Collections.reverseOrder(comparator));
+ localDeleted.putAll(doc.getLocalDeleted());
+
+ for (Map.Entry<Revision, String> entry : localDeleted.entrySet()) {
+ if (doc.isCommitted(entry.getKey())) {
+ latestDeleted = Boolean.parseBoolean(entry.getValue());
+ break;
+ }
+ }
+ return latestDeleted;
+ }
}
