Author: mduerig
Date: Mon Aug 22 14:56:43 2016
New Revision: 1757188
URL: http://svn.apache.org/viewvc?rev=1757188&view=rev
Log:
OAK-4675: SNFE thrown while testing FileStore.cleanup() running concurrently
with writes (fix for oak-segment)
* Synchronise FileAccess.Random.length as RandomAccessFile.length() is not
thread safe
* Test case
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileAccess.java
jackrabbit/oak/branches/1.4/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileAccess.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileAccess.java?rev=1757188&r1=1757187&r2=1757188&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileAccess.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileAccess.java
Mon Aug 22 14:56:43 2016
@@ -92,7 +92,7 @@ abstract class FileAccess {
}
@Override
- public int length() throws IOException {
+ public synchronized int length() throws IOException {
long length = file.length();
checkState(length < Integer.MAX_VALUE);
return (int) length;
Modified:
jackrabbit/oak/branches/1.4/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java?rev=1757188&r1=1757187&r2=1757188&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupIT.java
Mon Aug 22 14:56:43 2016
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.collect.Lists.newArrayList;
import static java.lang.Integer.getInteger;
+import static java.util.concurrent.Executors.newFixedThreadPool;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
import static org.apache.commons.io.FileUtils.deleteDirectory;
@@ -35,6 +36,7 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
@@ -49,9 +51,12 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nonnull;
@@ -61,6 +66,8 @@ import org.apache.jackrabbit.oak.api.Blo
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
+import org.apache.jackrabbit.oak.plugins.blob.ReferenceCollector;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.plugins.segment.file.NonCachingFileStore;
@@ -653,6 +660,71 @@ public class CompactionAndCleanupIT {
fileStore.close();
}
}
+
+ @Test
+ public void randomAccessFileConcurrentReadAndLength() throws Exception {
+ final FileStore fileStore = FileStore.newFileStore(directory)
+ .withMaxFileSize(1)
+ .withMemoryMapping(false)
+ .create();
+
+ final SegmentNodeStore nodeStore =
SegmentNodeStore.newSegmentNodeStore(fileStore).create();
+
+ ExecutorService executorService = newFixedThreadPool(300);
+ final AtomicInteger counter = new AtomicInteger();
+ final ReferenceCollector dummyCollector = new ReferenceCollector() {
+
+ @Override
+ public void addReference(String reference, String nodeId) {
+ // do nothing
+ }
+ };
+
+ try {
+ Callable<Void> concurrentWriteTask = new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ NodeBuilder builder = nodeStore.getRoot().builder();
+ builder.setProperty("blob-" + counter.getAndIncrement(),
createBlob(nodeStore, 25 * 25));
+ nodeStore.merge(builder, EmptyHook.INSTANCE,
CommitInfo.EMPTY);
+ fileStore.flush();
+ return null;
+ }
+ };
+
+ Callable<Void> concurrentCleanupTask = new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ fileStore.cleanup();
+ return null;
+ }
+ };
+
+ Callable<Void> concurrentReferenceCollector = new Callable<Void>()
{
+ @Override
+ public Void call() throws Exception {
+
fileStore.getTracker().collectBlobReferences(dummyCollector);
+ return null;
+ }
+ };
+
+ List<Future<?>> results = newArrayList();
+ results.add(executorService.submit(concurrentCleanupTask));
+
+ for (int i = 0; i < 100; i++) {
+ results.add(executorService.submit(concurrentWriteTask));
+
results.add(executorService.submit(concurrentReferenceCollector));
+ }
+
+ for (Future<?> result : results) {
+ assertNull(result.get());
+ }
+
+ } finally {
+ new ExecutorCloser(executorService).close();
+ fileStore.close();
+ }
+ }
private static void addContent(NodeBuilder builder) {
for (int k = 0; k < 10000; k++) {
