() {
+ @Override
+ public NodeDocument apply(DBObject input) {
+ return store.convertFromDBObject(Collection.NODES, input);
+ }
+ }), cursor);
+ }
+
+ private DBCollection getNodeCollection() {
+ return store.getDBCollection(Collection.NODES);
+ }
+
+ private DBCollection getClusterNodeCollection() {
+ return store.getDBCollection(Collection.CLUSTER_NODES);
+ }
+}
Property changes on: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (revision 1583596)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (working copy)
@@ -183,7 +183,7 @@
*
* Value: the revision.
*/
- private static final String LAST_REV = "_lastRev";
+ public static final String LAST_REV = "_lastRev";
/**
* Flag indicating that there are child nodes present. Its just used as a hint.
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java (revision 1583596)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Revision.java (working copy)
@@ -24,6 +24,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.jackrabbit.oak.stats.Clock;
/**
* A revision.
*/
@@ -58,6 +59,20 @@
*/
private final boolean branch;
+ /** Only set for testing */
+ private static Clock clock;
+
+ /**
+ *
+ * Only to be used for testing.
+ * Do Not Use Otherwise
+ *
+ *
+ * @param c - the clock
+ */
+ protected static void setClock(Clock c) {
+ clock = c;
+ }
public Revision(long timestamp, int counter, int clusterId) {
this(timestamp, counter, clusterId, false);
}
@@ -150,6 +165,9 @@
*/
public static long getCurrentTimestamp() {
long timestamp = System.currentTimeMillis();
+ if (clock != null) {
+ timestamp = clock.getTime();
+ }
if (timestamp < lastTimestamp) {
// protect against decreases in the system time,
// time machines, and other fluctuations in the time continuum
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (revision 1583596)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java (working copy)
@@ -134,5 +134,14 @@
return false;
}
}
+
+ @Override
+ public void dispose() {
+ try{
+ MongoConnection connection = new MongoConnection(uri);
+ connection.getDB().dropDatabase();
+ } catch(Exception e) {
+ }
+ }
}
}
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java (revision 1583596)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryTest.java (working copy)
@@ -90,7 +90,7 @@
//lastRev should not be updated for C #2
assertNull(y1.getLastRev().get(2));
- LastRevRecovery recovery = new LastRevRecovery(ds1);
+ LastRevRecoveryAgent recovery = new LastRevRecoveryAgent(ds1);
//Do not pass y1 but still y1 should be updated
recovery.recover(Iterators.forArray(x1,z1), 2);
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java (revision 0)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java (working copy)
@@ -0,0 +1,212 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import org.apache.jackrabbit.oak.stats.Clock;
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * Tests the restore of potentially missing _lastRev updates.
+ */
+@RunWith(Parameterized.class)
+public class LastRevSingleNodeRecoveryTest {
+ private DocumentStoreFixture fixture;
+
+ private Clock clock;
+
+ private DocumentMK mk;
+
+ public LastRevSingleNodeRecoveryTest(DocumentStoreFixture fixture) {
+ this.fixture = fixture;
+ }
+
+ @Parameterized.Parameters
+ public static Collection fixtures() throws IOException {
+ List fixtures = Lists.newArrayList();
+
+ DocumentStoreFixture mongo = new DocumentStoreFixture.MongoFixture();
+ if (mongo.isAvailable()) {
+ fixtures.add(new Object[] {mongo});
+ }
+ return fixtures;
+ }
+
+ private DocumentMK createMK(int clusterId) throws InterruptedException {
+ clock = new Clock.Virtual();
+ return openMK(clusterId, fixture.createDocumentStore());
+ }
+
+ private DocumentMK openMK(int clusterId, DocumentStore store) throws InterruptedException {
+ clock.waitUntil(System.currentTimeMillis());
+
+ // Sets the clock for testing
+ ClusterNodeInfo.setClock(clock);
+ Revision.setClock(clock);
+
+ DocumentMK.Builder builder = new DocumentMK.Builder();
+ builder.setAsyncDelay(0)
+ .setClusterId(clusterId)
+ .clock(clock)
+ .setDocumentStore(store);
+ mk = builder.open();
+ clock.waitUntil(Revision.getCurrentTimestamp());
+
+ return mk;
+ }
+
+ @Before
+ public void setUp() throws InterruptedException {
+ try {
+ mk = createMK(0);
+ Assume.assumeNotNull(mk);
+
+ // initialize node hierarchy
+ mk.commit("/", "+\"x\" : { \"y\": {\"z\":{} } }", null, null);
+ mk.commit("/", "+\"a\" : { \"b\": {\"c\": {}} }", null, null);
+ } catch (Exception e) {
+ Assume.assumeNoException(e);
+ }
+ }
+
+ @Test
+ public void testLastRevRestoreOnNodeStart() throws Exception {
+ // pending updates
+ setupScenario();
+
+ // renew lease
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime() + 10);
+ mk.getClusterInfo().renewLease(0);
+
+ // so that the current time is more than the current lease end
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime() + 1000);
+ // Recreate mk instance, to simulate fail condition and recovery on start
+ mk = openMK(0, mk.getNodeStore().getDocumentStore());
+
+ int pendingCount = mk.getPendingWriteCount();
+
+ // so that the current time is more than the current lease end
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime() + 1000);
+ // Immediately check again, now should not have done any changes.
+ LastRevRecoveryAgent recoveryAgent = mk.getNodeStore().getLastRevRecoveryAgent();
+ /** Now there should have been pendingCount updates **/
+ assertEquals(pendingCount, recoveryAgent.recover(mk.getClusterInfo().getId()));
+ }
+
+ @Test
+ public void testLastRevRestore() throws Exception {
+ setupScenario();
+
+ int pendingCount = mk.getPendingWriteCount();
+ // so that the current time is more than the current lease end
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime() + 1000);
+ LastRevRecoveryAgent recoveryAgent = mk.getNodeStore().getLastRevRecoveryAgent();
+
+ /** All pending updates should have been restored **/
+ assertEquals(pendingCount, recoveryAgent.recover(mk.getClusterInfo().getId()));
+ }
+
+
+ @Test
+ public void testNoMissingUpdates() throws Exception {
+ setupScenario();
+ mk.backgroundWrite();
+
+ // move the time forward and do another update of the root node so that only 2 nodes are
+ // candidates
+ clock.waitUntil(clock.getTime() + 5000);
+ mk.commit("/", "^\"a/key2\" : \"value2\"", null, null);
+ mk.backgroundWrite();
+
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime());
+ mk.getClusterInfo().renewLease(0);
+
+ // Should be 0
+ int pendingCount = mk.getPendingWriteCount();
+ LastRevRecoveryAgent recoveryAgent = mk.getNodeStore().getLastRevRecoveryAgent();
+
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime());
+ /** There should have been no updates **/
+ assertEquals(pendingCount, recoveryAgent.recover(mk.getClusterInfo().getId()));
+ }
+
+ private void setupScenario() throws InterruptedException {
+ // add some nodes which won't be returned
+ mk.commit("/", "+\"u\" : { \"v\": {}}", null, null);
+ mk.commit("/u", "^\"v/key1\" : \"value1\"", null, null);
+
+ // move the time forward so that the root gets updated
+ clock.waitUntil(clock.getTime() + 5000);
+ mk.commit("/", "^\"a/key1\" : \"value1\"", null, null);
+ mk.backgroundWrite();
+
+ // move the time forward to have a new node under root
+ clock.waitUntil(clock.getTime() + 5000);
+ mk.commit("/", "+\"p\":{}", null, null);
+
+ // move the time forward to write all pending changes
+ clock.waitUntil(clock.getTime() + 5000);
+ mk.backgroundWrite();
+
+ // renew lease one last time
+ clock.waitUntil(clock.getTime() + mk.getClusterInfo().getLeaseTime());
+ mk.getClusterInfo().renewLease(0);
+
+ clock.waitUntil(clock.getTime() + 5000);
+ // add nodes won't trigger _lastRev updates
+ addNodes();
+ }
+
+ /**
+ * Should have the
+ */
+ private void addNodes() {
+ // change node /a/b/c by adding a property
+ mk.commit("/a/b", "^\"c/key1\" : \"value1\"", null, null);
+ // add node /a/b/c/d
+ mk.commit("/a/b/c", "+\"d\":{}", null, null);
+ // add node /a/b/f
+ mk.commit("/a/b", "+\"f\" : {}", null, null);
+ // add node /a/b/f/e
+ mk.commit("/a/b/f", "+\"e\": {}", null, null);
+ // change node /x/y/z
+ mk.commit("/x/y", "^\"z/key1\" : \"value1\"", null, null);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ Revision.setClock(null);
+ ClusterNodeInfo.setClock(null);
+ mk.dispose();
+ fixture.dispose();
+ }
+}
Property changes on: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property