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 md...@apache.org on 2018/10/30 13:59:46 UTC
svn commit: r1845241 - in /jackrabbit/oak/branches/1.8: ./
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
Author: mduerig
Date: Tue Oct 30 13:59:46 2018
New Revision: 1845241
URL: http://svn.apache.org/viewvc?rev=1845241&view=rev
Log:
OAK-7853: SegmentBufferWriter not flushed after OnRC
merged r1844549
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 30 13:59:46 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/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,1822201,1822207,1822527,1822723,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,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,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,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844642,1844728,1844932
+/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,1822201,1822207,1822527,1822723,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,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,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,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844642,1844728,1844932
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java?rev=1845241&r1=1845240&r2=1845241&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java Tue Oct 30 13:59:46 2018
@@ -68,6 +68,11 @@ public class SegmentBufferWriterPool imp
*/
private final Set<SegmentBufferWriter> disposed = newHashSet();
+ /**
+ * Retired writers that have not yet been flushed from a previous GC generation
+ */
+ private final Set<SegmentBufferWriter> disposedOldGen = newHashSet();
+
@Nonnull
private final SegmentIdProvider idProvider;
@@ -116,6 +121,11 @@ public class SegmentBufferWriterPool imp
toFlush.addAll(writers.values());
writers.clear();
+ // Collect all writers from old GC generations that
+ // have been disposed
+ toFlush.addAll(disposedOldGen);
+ disposedOldGen.clear();
+
// Collect all borrowed writers, which we need to wait for.
// Clear the list so they will get disposed once returned.
toReturn.addAll(borrowed);
@@ -192,7 +202,7 @@ public class SegmentBufferWriterPool imp
gcGeneration.get()
);
} else if (!writer.getGCGeneration().equals(gcGeneration.get())) {
- disposed.add(writer);
+ disposedOldGen.add(writer);
writer = new SegmentBufferWriter(
idProvider,
reader,
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java?rev=1845241&r1=1845240&r2=1845241&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java Tue Oct 30 13:59:46 2018
@@ -18,25 +18,36 @@
*/
package org.apache.jackrabbit.oak.segment.file;
+import static com.google.common.collect.Maps.newLinkedHashMap;
+import static org.apache.jackrabbit.oak.segment.DefaultSegmentWriterBuilder.defaultSegmentWriterBuilder;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.Random;
+import java.util.concurrent.CountDownLatch;
import com.google.common.base.Strings;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
+import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
+import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter;
import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
import org.apache.jackrabbit.oak.segment.SegmentNodeState;
import org.apache.jackrabbit.oak.segment.SegmentTestConstants;
import org.apache.jackrabbit.oak.segment.SegmentWriter;
+import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
+import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -210,4 +221,57 @@ public class FileStoreIT {
}
}
+ @Test
+ public void snfeAfterOnRC()
+ throws IOException, InvalidFileStoreVersionException, InterruptedException {
+ Map<String, String> roots = newLinkedHashMap();
+ try (FileStore rwStore = fileStoreBuilder(getFileStoreFolder()).build()) {
+
+ // Block scheduled journal updates
+ CountDownLatch blockJournalUpdates = new CountDownLatch(1);
+
+ // Ensure we have a non empty journal
+ rwStore.flush();
+
+ // Add a revisions
+ roots.putIfAbsent(addNode(rwStore, "g"), "g");
+
+ // Simulate compaction by writing a new head state of the next generation
+ SegmentNodeState base = rwStore.getHead();
+ GCGeneration gcGeneration = base.getRecordId().getSegmentId().getGcGeneration();
+ DefaultSegmentWriter nextGenerationWriter = defaultSegmentWriterBuilder("c")
+ .withGeneration(gcGeneration.nextFull())
+ .build(rwStore);
+ RecordId headId = nextGenerationWriter.writeNode(EmptyNodeState.EMPTY_NODE);
+ rwStore.getRevisions().setHead(base.getRecordId(), headId);
+
+ // Add another revisions
+ roots.putIfAbsent(addNode(rwStore, "g"), "g");
+ blockJournalUpdates.countDown();
+ }
+
+ // Open the store again in read only mode and check all revisions.
+ // This simulates accessing the store after an unclean shutdown.
+ try (ReadOnlyFileStore roStore = fileStoreBuilder(getFileStoreFolder()).buildReadOnly()) {
+ for (Entry<String, String> revision : roots.entrySet()) {
+ roStore.setRevision(revision.getKey());
+ checkNode(roStore.getHead());
+ }
+ }
+ }
+
+ private static String addNode(FileStore store, String name) throws InterruptedException {
+ SegmentNodeState base = store.getHead();
+ SegmentNodeBuilder builder = base.builder();
+ builder.setChildNode(name);
+ store.getRevisions().setHead(base.getRecordId(), builder.getNodeState().getRecordId());
+ return store.getRevisions().getHead().toString();
+ }
+
+ private static void checkNode(NodeState node) {
+ for (ChildNodeEntry cne : node.getChildNodeEntries()) {
+ checkNode(cne.getNodeState());
+ }
+ }
+
}