svn commit: r1748540 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

[md...@apache.org]

Author: mduerig
Date: Wed Jun 15 10:32:45 2016
New Revision: 1748540

URL: http://svn.apache.org/viewvc?rev=1748540&view=rev
Log:
OAK-4291: FileStore.flush prone to races leading to corruption
Remove dangling FIXMEs

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1748540&r1=1748539&r2=1748540&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Wed Jun 15 10:32:45 2016
@@ -631,13 +631,6 @@ public class FileStore implements Segmen
         revisions.flush(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                // FIXME OAK-4291: FileStore.flush prone to races leading to corruption
-                // There is a small windows that could lead to a corrupted store:
-                // if we crash right after setting the persisted head but before any delay-flushed
-                // SegmentBufferWriter instance flushes (see SegmentBufferWriterPool.returnWriter())
-                // then that data is lost although it might be referenced from the persisted head already.
-                // Need a test case. Possible fix: return a future from flush() and set the persisted head
-                // in the completion handler.
                 segmentWriter.flush();
                 tarWriter.flush();
                 return null;
@@ -1079,9 +1072,6 @@ public class FileStore implements Segmen
         try {
             flush();
             revisions.close();
-            // FIXME OAK-4291: FileStore.flush prone to races leading to corruption
-            // Replace this with a way to "close" the underlying SegmentBufferWriter(s)
-            // tracker.getWriter().dropCache();
             fileStoreLock.writeLock().lock();
             try {
                 closeAndLogOnFail(tarWriter);