Author: chetanm
Date: Mon Oct 6 16:02:09 2014
New Revision: 1629688
URL: http://svn.apache.org/r1629688
Log:
OAK-2144 - Intermittent Node not found at given revision with DocumentNodeStore
Adding testcase currently disabled
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1629688&r1=1629687&r2=1629688&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Mon Oct 6 16:02:09 2014
@@ -597,6 +597,10 @@ public final class DocumentNodeStore
docChildrenCache.invalidateAll();
}
+ void invalidateNodeCache(String path, Revision revision){
+ nodeCache.invalidate(new PathRev(path, revision));
+ }
+
public int getPendingWriteCount() {
return unsavedLastRevisions.getPaths().size();
}
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java?rev=1629688&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
Mon Oct 6 16:02:09 2014
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.document;
+
+import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.Clock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class ClusterRevisionComparisonTest {
+ private MemoryDocumentStore ds = new MemoryDocumentStore();
+ private MemoryBlobStore bs = new MemoryBlobStore();
+ private Clock clock = new Clock.Virtual();
+
+ @Before
+ public void setUp(){
+ Revision.setClock(clock);
+ }
+
+ @Ignore("OAK-2144") //FIX ME OAK-2144
+ @Test
+ public void revisionComparisonMultipleClusterNode() throws Exception{
+ DocumentNodeStore c1 = createNS(1);
+ DocumentNodeStore c2 = createNS(2);
+ DocumentNodeStore c3 = createNS(3);
+
+ //1. Create /a and make it visible to all cluster nodes
+ createNode(c1, "/a");
+ runBgOps(c1, c2, c3);
+
+ //2. Time T1. Create /a/c2 but do not push the changes yet rT1-C2
+ createNode(c2, "/a/c2");
+
+ //3. Time T2. Create /a/c3 and push the changes rT2-C3
+ createNode(c3, "/a/c3");
+ runBgOps(c3);
+
+ //4. Time T3. Read the changes /a/c3 by c3 created at T2
+ // would be considered seen at T3 i.e. rT2-C3 -> rT3-C1
+ runBgOps(c1);
+
+ //5. Push changes
+ runBgOps(c2);
+
+ //6. Time T4. Read the changes /a/c2 by c2 created at T1.
+ // Would be considered seen ar T4 i.e. rT1-C2 -> rT4-C1
+ // Now from C1 view rT1-C2 > rT2-C3 even though T1 < T2
+ //so effectively changes done in future in C3 in absolute time terms
+ //is considered to be seen in past by C1
+ runBgOps(c1);
+
+ DocumentNodeState c1ns1 = c1.getRoot();
+ Iterables.size(c1ns1.getChildNode("a").getChildNodeEntries());
+
+ createNode(c1, "/a/c1");
+
+ //7. Purge revision comparator. Also purge entries from nodeCache
+ //such that later reads at rT1-C2 triggers read from underlying
DocumentStore
+ c1.invalidateNodeCache("/a/c2" ,
((DocumentNodeState)c1ns1.getChildNode("a")).getLastRevision());
+ c1.invalidateNodeCache("/a/c3" ,
((DocumentNodeState)c1ns1.getChildNode("a")).getLastRevision());
+
+ //Revision compartor purge by moving in future
+ clock.waitUntil(clock.getTime() +
DocumentNodeStore.REMEMBER_REVISION_ORDER_MILLIS * 2);
+ runBgOps(c1);
+
+ DocumentNodeState c1ns2 = c1.getRoot();
+
+ //Trigger a diff. With OAK-2144 an exception would be thrown as diff
traverses
+ //the /a children
+ c1ns1.compareAgainstBaseState(c1ns2, new ClusterTest.TrackingDiff());
+ }
+
+ @After
+ public void tearDown(){
+ Revision.resetClockToDefault();
+ }
+
+ private DocumentNodeStore createNS(int clusterId){
+ return new DocumentMK.Builder()
+ .setDocumentStore(ds)
+ .setBlobStore(bs)
+ .setClusterId(clusterId)
+ .setAsyncDelay(0)
+ .open()
+ .getNodeStore();
+ }
+
+ private NodeState createNode(NodeStore ns, String path) throws
CommitFailedException {
+ NodeBuilder nb = ns.getRoot().builder();
+ NodeBuilder cb = nb;
+ for (String name : PathUtils.elements(path)) {
+ cb = cb.child(name);
+ }
+ return ns.merge(nb, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ }
+
+ private static void runBgOps(DocumentNodeStore... stores) {
+ for (DocumentNodeStore ns : stores) {
+ ns.runBackgroundOperations();
+ }
+ }
+
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1629688&r1=1629687&r2=1629688&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
Mon Oct 6 16:02:09 2014
@@ -416,7 +416,7 @@ public class ClusterTest {
}
}
- private static class TrackingDiff extends DefaultNodeStateDiff {
+ static class TrackingDiff extends DefaultNodeStateDiff {
final String path;
final Set<String> added;
