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 re...@apache.org on 2019/06/26 11:40:20 UTC
svn commit: r1862126 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: reschke
Date: Wed Jun 26 11:40:20 2019
New Revision: 1862126
URL: http://svn.apache.org/viewvc?rev=1862126&view=rev
Log:
OAK-7564: Commit fails when forced journal push throws exception (merged r1835056, r1835062 into 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 26 11:40:20 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160
,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845
865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160
,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845
731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1862126&r1=1862125&r2=1862126&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Wed Jun 26 11:40:20 2019
@@ -704,6 +704,25 @@ public class Commit {
}
/**
+ * Applies the lastRev updates to the {@link LastRevTracker} of the
+ * DocumentNodeStore.
+ *
+ * @param isBranchCommit whether this is a branch commit.
+ */
+ void applyLastRevUpdates(boolean isBranchCommit) {
+ LastRevTracker tracker = nodeStore.createTracker(revision, isBranchCommit);
+ for (String path : modifiedNodes) {
+ UpdateOp op = operations.get(path);
+ // track _lastRev only when path is not for a bundled node state
+ if ((op == null || !hasContentChanges(op) || denotesRoot(path))
+ && !isBundled(path)) {
+ // track intermediate node and root
+ tracker.track(path);
+ }
+ }
+ }
+
+ /**
* Apply the changes to the DocumentNodeStore (to update the cache).
*
* @param before the revision right before this commit.
@@ -727,7 +746,6 @@ public class Commit {
Revision rev = isBranchCommit ? revision.asBranchRevision() : revision;
RevisionVector after = before.update(rev);
DiffCache.Entry cacheEntry = nodeStore.getDiffCache().newEntry(before, after, true);
- LastRevTracker tracker = nodeStore.createTracker(revision, isBranchCommit);
List<String> added = new ArrayList<String>();
List<String> removed = new ArrayList<String>();
List<String> changed = new ArrayList<String>();
@@ -749,14 +767,9 @@ public class Commit {
}
UpdateOp op = operations.get(path);
- // track _lastRev and apply to cache only when
- // path is not for a bundled node state
+ // apply to cache only when path is not for a bundled node state
if (!isBundled(path)) {
boolean isNew = op != null && op.isNew();
- if (op == null || !hasContentChanges(op) || denotesRoot(path)) {
- // track intermediate node and root
- tracker.track(path);
- }
nodeStore.applyChanges(before, after, rev, path, isNew,
added, removed, changed);
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1862126&r1=1862125&r2=1862126&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Wed Jun 26 11:40:20 2019
@@ -948,23 +948,50 @@ public final class DocumentNodeStore
public void headOfQueue(@NotNull Revision revision) {
// remember before revision
RevisionVector before = getHeadRevision();
- // apply changes to cache based on before revision
- c.applyToCache(before, false);
- // track modified paths
- changes.modified(c.getModifiedPaths());
- changes.readFrom(info);
- changes.addChangeSet(getChangeSet(info));
+
// update head revision
Revision r = c.getRevision();
newHead[0] = before.update(r);
- if (changes.getNumChangedNodes() >= journalPushThreshold) {
- LOG.info("Pushing journal entry at {} as number of changes ({}) have reached {}",
- r, changes.getNumChangedNodes(), journalPushThreshold);
- pushJournalEntry(r);
+ boolean success = false;
+ boolean cacheUpdated = false;
+ try {
+ // apply lastRev updates
+ c.applyLastRevUpdates(false);
+
+ // track modified paths
+ changes.modified(c.getModifiedPaths());
+ changes.readFrom(info);
+ changes.addChangeSet(getChangeSet(info));
+
+ // if we get here all required in-memory changes
+ // have been applied. The following operations in
+ // the try block may fail and the commit can still
+ // be considered successful
+ success = true;
+
+ // apply changes to cache, based on before revision
+ c.applyToCache(before, false);
+ cacheUpdated = true;
+ if (changes.getNumChangedNodes() >= journalPushThreshold) {
+ LOG.info("Pushing journal entry at {} as number of changes ({}) have reached threshold of {}",
+ r, changes.getNumChangedNodes(), journalPushThreshold);
+ pushJournalEntry(r);
+ }
+ } catch (Throwable e) {
+ if (success) {
+ if (cacheUpdated) {
+ LOG.warn("Pushing journal entry at {} failed", revision, e);
+ } else {
+ LOG.warn("Updating caches at {} failed", revision, e);
+ }
+ } else {
+ LOG.error("Applying in-memory changes at {} failed", revision, e);
+ }
+ } finally {
+ setRoot(newHead[0]);
+ commitQueue.headRevisionChanged();
+ dispatcher.contentChanged(getRoot(), info);
}
- setRoot(newHead[0]);
- commitQueue.headRevisionChanged();
- dispatcher.contentChanged(getRoot(), info);
}
});
return newHead[0];
@@ -974,6 +1001,7 @@ public final class DocumentNodeStore
} else {
// branch commit
try {
+ c.applyLastRevUpdates(isBranch);
c.applyToCache(c.getBaseRevision(), isBranch);
return c.getBaseRevision().update(c.getRevision().asBranchRevision());
} finally {
@@ -2589,7 +2617,7 @@ public final class DocumentNodeStore
}
}
- private void pushJournalEntry(Revision r) {
+ private void pushJournalEntry(Revision r) throws DocumentStoreException {
if (!changes.hasChanges()) {
LOG.debug("Not pushing journal as there are no changes");
} else if (store.create(JOURNAL, singletonList(changes.asUpdateOp(r)))) {
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java?rev=1862126&r1=1862125&r2=1862126&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java Wed Jun 26 11:40:20 2019
@@ -52,9 +52,14 @@ class MergeCommit extends Commit {
}
@Override
- public void applyToCache(RevisionVector before, boolean isBranchCommit) {
+ void applyLastRevUpdates(boolean isBranchCommit) {
// do nothing for a merge commit, only notify node
// store about merged revisions
nodeStore.revisionsMerged(branchCommits);
}
+
+ @Override
+ public void applyToCache(RevisionVector before, boolean isBranchCommit) {
+ // do nothing for a merge commit
+ }
}
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1862126&r1=1862125&r2=1862126&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Wed Jun 26 11:40:20 2019
@@ -2945,6 +2945,64 @@ public class DocumentNodeStoreTest {
assertTrue("Two added paths should have forced flush", numChangedPaths == 0);
}
+ // OAK-7564
+ @Test
+ public void forceJournalFlushWithException() throws Exception {
+ AtomicBoolean failJournalOps = new AtomicBoolean();
+ DocumentStore store = new MemoryDocumentStore() {
+ @Override
+ public <T extends Document> boolean create(Collection<T> collection,
+ List<UpdateOp> updateOps) {
+ if (collection == Collection.JOURNAL && failJournalOps.get()) {
+ throw new DocumentStoreException("failure");
+ }
+ return super.create(collection, updateOps);
+ }
+ };
+ DocumentNodeStore ns = builderProvider.newBuilder().setAsyncDelay(0)
+ .setDocumentStore(store).getNodeStore();
+ ns.setMaxBackOffMillis(0);
+ ns.setJournalPushThreshold(2);
+
+ NodeBuilder builder = ns.getRoot().builder();
+ builder.child("foo");
+ builder.child("bar");
+ // fail operations that want to create journal documents
+ failJournalOps.set(true);
+ // now two possible outcomes are fine.
+ // Either the merge fails with an exception and the changes
+ // didn't make it to the node store
+ // OR
+ // the merge succeeds and the changes must be visible.
+ boolean success = false;
+ try {
+ merge(ns, builder);
+ success = true;
+ } catch (CommitFailedException e) {
+ // permitted as well
+ } finally {
+ // resume proper journal operations
+ failJournalOps.set(false);
+ }
+ if (success) {
+ // check if the changes are there
+ assertTrue(ns.getRoot().hasChildNode("foo"));
+ assertTrue(ns.getRoot().hasChildNode("bar"));
+ } else {
+ // check changes are not visible and didn't corrupt the
+ // repository. that is, we can add the nodes after enabling
+ // operations again
+ assertFalse(ns.getRoot().hasChildNode("foo"));
+ assertFalse(ns.getRoot().hasChildNode("bar"));
+
+ builder = ns.getRoot().builder();
+ builder.child("foo");
+ builder.child("bar");
+ merge(ns, builder);
+ }
+ ns.runBackgroundOperations();
+ }
+
@Test
public void commitRootSameAsModifiedPath() throws Exception{
WriteCountingStore ws = new WriteCountingStore(true);