Author: mreutegg
Date: Wed Jul 26 12:01:43 2017
New Revision: 1803035
URL: http://svn.apache.org/viewvc?rev=1803035&view=rev
Log:
OAK-6495: Fallback to classic diff when journal is broken
Merged revisions 1802973,1803026 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 26 12:01:43 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675,1802548
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799219,1799389,1799393,1799924,1800269,1800606,1800613,1800974,1801118-1801119,1801675,1802548,1802973,1803026
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1803035&r1=1803034&r2=1803035&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Jul 26 12:01:43 2017
@@ -2423,10 +2423,10 @@ public final class DocumentNodeStore
final long start = debug ? now() : 0;
long getChildrenDoneIn = start;
- String diff;
- String diffAlgo;
- RevisionVector fromRev = from.getLastRevision();
- RevisionVector toRev = to.getLastRevision();
+ String diff = null;
+ String diffAlgo = null;
+ RevisionVector fromRev = null;
+ RevisionVector toRev = null;
long minTimestamp = Utils.getMinTimestampForDiff(
from.getRootRevision(), to.getRootRevision(),
getMinExternalRevisions());
@@ -2435,11 +2435,22 @@ public final class DocumentNodeStore
Revision tailRev = journalGarbageCollector.getTailRevision();
if (!disableJournalDiff
&& tailRev.getTimestamp() < minTimestamp) {
- diffAlgo = "diffJournalChildren";
- fromRev = from.getRootRevision();
- toRev = to.getRootRevision();
- diff = new JournalDiffLoader(from, to, this).call();
- } else {
+ try {
+ diff = new JournalDiffLoader(from, to, this).call();
+ diffAlgo = "diffJournalChildren";
+ fromRev = from.getRootRevision();
+ toRev = to.getRootRevision();
+ } catch (RuntimeException e) {
+ LOG.warn("diffJournalChildren failed with " +
+ e.getClass().getSimpleName() +
+ ", falling back to classic diff", e);
+ }
+ }
+ if (diff == null) {
+ // fall back to classic diff
+ fromRev = from.getLastRevision();
+ toRev = to.getLastRevision();
+
JsopWriter w = new JsopStream();
boolean continueDiff = bundledDocDiffer.diff(from, to, w);
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1803035&r1=1803034&r2=1803035&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Wed Jul 26 12:01:43 2017
@@ -18,18 +18,21 @@ package org.apache.jackrabbit.oak.plugin
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
+import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.MODIFIED_IN_SECS;
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.MODIFIED_IN_SECS_RESOLUTION;
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.NUM_REVS_THRESHOLD;
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.PREV_SPLIT_FACTOR;
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.getModifiedInSecs;
+import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -2923,6 +2926,59 @@ public class DocumentNodeStoreTest {
assertTrue(names.contains("a"));
}
+ // OAK-6495
+ @Test
+ public void diffWithBrokenJournal() throws Exception {
+ Clock clock = new Clock.Virtual();
+ clock.waitUntil(System.currentTimeMillis());
+ Revision.setClock(clock);
+ MemoryDocumentStore docStore = new MemoryDocumentStore();
+ DocumentNodeStore ns = builderProvider.newBuilder()
+ .setDocumentStore(docStore)
+ .setBundlingDisabled(true)
+ .setAsyncDelay(0).clock(clock).getNodeStore();
+
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child("test");
+ merge(ns, builder);
+
+ NodeState before = ns.getRoot().getChildNode("test");
+
+ builder = ns.getRoot().builder();
+ NodeBuilder test = builder.child("test");
+ String firstChildId = Utils.getIdFromPath("/test/child-0");
+ for (int i = 0; ; i++) {
+ NodeBuilder child = test.child("child-" + i);
+ for (int j = 0; j < 10; j++) {
+ child.setProperty("p-" + j, "value");
+ }
+ if (docStore.find(NODES, firstChildId) != null) {
+ // branch was created
+ break;
+ }
+ }
+ merge(ns, builder);
+ ns.runBackgroundOperations();
+
+ Revision head = ns.getHeadRevision().getRevision(ns.getClusterId());
+ assertNotNull(head);
+
+ JournalEntry entry = ns.getDocumentStore().find(JOURNAL,
JournalEntry.asId(head));
+ assertNotNull(entry);
+
+ // must reference at least one branch commit
+ assertThat(Iterables.size(entry.getBranchCommits()), greaterThan(0));
+ // now remove them
+ for (JournalEntry bc : entry.getBranchCommits()) {
+ docStore.remove(JOURNAL, bc.getId());
+ }
+
+ // compare must still succeed even when branch commits
+ // are missing in the journal
+ NodeState after = ns.getRoot().getChildNode("test");
+ after.compareAgainstBaseState(before, new DefaultNodeStateDiff());
+ }
+
private static class TestException extends RuntimeException {
}
