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 2015/07/15 14:55:53 UTC
svn commit: r1691201 - in
/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby:
DataStoreTestBase.java TestBase.java
Author: mduerig
Date: Wed Jul 15 12:55:52 2015
New Revision: 1691201
URL: http://svn.apache.org/r1691201
Log:
OAK-3109: OOME in tarkmk standby tests
Change cache size to 1MB
Modified:
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1691201&r1=1691200&r2=1691201&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Wed Jul 15 12:55:52 2015
@@ -18,8 +18,18 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
-import com.google.common.io.ByteStreams;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+
+import com.google.common.io.ByteStreams;
import org.apache.jackrabbit.core.data.FileDataStore;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -38,13 +48,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before;
import org.junit.Test;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Random;
-
-import static org.junit.Assert.*;
-
public class DataStoreTestBase extends TestBase {
protected boolean storesCanBeEqual = false;
@@ -59,7 +62,12 @@ public class DataStoreTestBase extends T
fds.setMinRecordLength(4092);
fds.init(path);
DataStoreBlobStore blobStore = new DataStoreBlobStore(fds);
- return new FileStore(blobStore, d, 1, false);
+ return FileStore.newFileStore(d)
+ .withMaxFileSize(1)
+ .withMemoryMapping(false)
+ .withCacheSize(1)
+ .withBlobStore(blobStore)
+ .create();
}
protected byte[] addTestContent(NodeStore store, String child, int size)
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1691201&r1=1691200&r2=1691201&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Wed Jul 15 12:55:52 2015
@@ -18,14 +18,14 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
import java.io.File;
import java.io.IOException;
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
public class TestBase {
int port = Integer.valueOf(System.getProperty("standby.server.port", "52800"));
@@ -56,8 +56,16 @@ public class TestBase {
storeC = setupSecondary(directoryC);
}
+ private static FileStore newFileStore(File directory) throws IOException {
+ return FileStore.newFileStore(directory)
+ .withMaxFileSize(1)
+ .withMemoryMapping(false)
+ .withCacheSize(1)
+ .create();
+ }
+
protected FileStore setupPrimary(File directory) throws IOException {
- return new FileStore(directory, 1, false);
+ return newFileStore(directory);
}
protected FileStore getPrimary() {
@@ -65,7 +73,7 @@ public class TestBase {
}
protected FileStore setupSecondary(File directory) throws IOException {
- return new FileStore(directoryC, 1, false);
+ return newFileStore(directoryC);
}
protected FileStore getSecondary() {
@@ -80,7 +88,7 @@ public class TestBase {
setUpServerAndClient();
directoryC2 = createTmpTargetDir("FailoverClient2Test");
- storeC2 = new FileStore(directoryC2, 1, false);
+ storeC2 = newFileStore(directoryC2);
}
public void closeServerAndClient() {