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 al...@apache.org on 2015/08/12 16:04:57 UTC
svn commit: r1695521 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment:
SegmentOverflowExceptionIT.java file/LargeNumberOfPropertiesTestIT.java
file/SegmentReferenceLimitTestIT.java
Author: alexparvulescu
Date: Wed Aug 12 14:04:57 2015
New Revision: 1695521
URL: http://svn.apache.org/r1695521
Log:
OAK-2545 SegmentMk IT tests are too intensive
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java?rev=1695521&r1=1695520&r2=1695521&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentOverflowExceptionIT.java Wed Aug 12 14:04:57 2015
@@ -21,9 +21,10 @@ package org.apache.jackrabbit.oak.plugin
import static org.apache.commons.io.FileUtils.deleteDirectory;
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD;
import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.MEMORY_THRESHOLD_DEFAULT;
+import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD;
import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore;
+import static org.junit.Assume.assumeTrue;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -33,7 +34,6 @@ import java.util.concurrent.Callable;
import javax.annotation.Nonnull;
-import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
@@ -45,18 +45,29 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Iterables;
+
/**
- * Test for reproducing OAK-2662. This test will never terminate unless it fails,
- * thus it is marked as @Ignored for now.
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2662 SegmentOverflowException in HeavyWriteIT on Jenkins}</p>
+ *
+ * <p><b>This test will never terminate unless it fails</b>, thus it is disabled by default. On the
+ * command line specify {@code -DSegmentOverflowExceptionIT=true} to enable
+ * them.</p>
+ *
+ *<p>If you only want to run this test:<br>
+ * {@code mvn verify -Dsurefire.skip.ut=true -PintegrationTesting -Dit.test=SegmentOverflowExceptionIT -DSegmentOverflowExceptionIT=true}
+ * </p>
*/
-@Ignore("long running")
public class SegmentOverflowExceptionIT {
- private static final Logger LOG = LoggerFactory.getLogger(SegmentOverflowExceptionIT.class);
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(SegmentOverflowExceptionIT.class);
+ private static final boolean ENABLED = Boolean
+ .getBoolean(SegmentOverflowExceptionIT.class.getSimpleName());
private final Random rnd = new Random();
@@ -64,6 +75,7 @@ public class SegmentOverflowExceptionIT
@Before
public void setUp() throws IOException {
+ assumeTrue(ENABLED);
directory = File.createTempFile(getClass().getSimpleName(), "dir", new File("target"));
directory.delete();
directory.mkdir();
@@ -72,7 +84,9 @@ public class SegmentOverflowExceptionIT
@After
public void cleanDir() {
try {
- deleteDirectory(directory);
+ if (directory != null) {
+ deleteDirectory(directory);
+ }
} catch (IOException e) {
LOG.error("Error cleaning directory", e);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java?rev=1695521&r1=1695520&r2=1695521&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java Wed Aug 12 14:04:57 2015
@@ -18,31 +18,47 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.file;
+import static org.apache.commons.io.FileUtils.deleteDirectory;
+import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore;
+import static org.junit.Assume.assumeTrue;
+
import java.io.File;
import java.io.IOException;
-import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2481 IllegalStateException in TarMk with large number of properties}</p>
+ *
+ * <p>These tests are disabled by default due to their long running time. On the
+ * command line specify {@code -DLargeNumberOfPropertiesTestIT=true} to enable
+ * them.</p>
+ *
+ *<p>If you only want to run this test:<br>
+ * {@code mvn verify -Dsurefire.skip.ut=true -PintegrationTesting -Dit.test=LargeNumberOfPropertiesTestIT -DLargeNumberOfPropertiesTestIT=true}
+ * </p>
+ */
public class LargeNumberOfPropertiesTestIT {
private static final Logger LOG = LoggerFactory
- .getLogger(SegmentReferenceLimitTestIT.class);
+ .getLogger(LargeNumberOfPropertiesTestIT.class);
+ private static final boolean ENABLED = Boolean
+ .getBoolean(LargeNumberOfPropertiesTestIT.class.getSimpleName());
private File directory;
@Before
public void setUp() throws IOException {
- directory = File.createTempFile("LargeNumberOfPropertiesTestIT", "dir",
+ assumeTrue(ENABLED);
+ directory = File.createTempFile(getClass().getSimpleName(), "dir",
new File("target"));
directory.delete();
directory.mkdir();
@@ -51,24 +67,18 @@ public class LargeNumberOfPropertiesTest
@After
public void cleanDir() {
try {
- FileUtils.deleteDirectory(directory);
+ if (directory != null) {
+ deleteDirectory(directory);
+ }
} catch (IOException e) {
LOG.error("Error cleaning directory", e);
}
}
- /**
- * OAK-2481 IllegalStateException in TarMk with large number of properties
- *
- * TODO Test is currently ignored because of how memory intensive it is
- *
- * @see <a
- * href="https://issues.apache.org/jira/browse/OAK-2481">OAK-2481</a>
- */
@Test
- @Ignore
public void corruption() throws Exception {
- FileStore fileStore = new FileStore(directory, 5, 0, false);
+ FileStore fileStore = newFileStore(directory).withMaxFileSize(5)
+ .withNoCache().withMemoryMapping(true).create();
SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
NodeBuilder root = nodeStore.getRoot().builder();
@@ -78,7 +88,7 @@ public class LargeNumberOfPropertiesTest
// i=26 hits the hard limit for the number of properties a node can
// have (262144)
for (int i = 0; i < 25; i++) {
- System.out.println(i);
+ LOG.debug("run {}/24", i);
for (int j = 0; j < 10000; j++) {
c.setProperty("int-" + i + "-" + j, i);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java?rev=1695521&r1=1695520&r2=1695521&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java Wed Aug 12 14:04:57 2015
@@ -19,6 +19,10 @@
package org.apache.jackrabbit.oak.plugins.segment.file;
+import static org.apache.commons.io.FileUtils.deleteDirectory;
+import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore;
+import static org.junit.Assume.assumeTrue;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,7 +31,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -36,20 +39,35 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2294 Corrupt repository after concurrent version operations}</p>
+ *
+ * <p>These tests are disabled by default due to their long running time. On the
+ * command line specify {@code -DSegmentReferenceLimitTestIT=true} to enable
+ * them.</p>
+ *
+ *<p>If you only want to run this test:<br>
+ * {@code mvn verify -Dsurefire.skip.ut=true -PintegrationTesting -Dit.test=SegmentReferenceLimitTestIT -DSegmentReferenceLimitTestIT=true}
+ * </p>
+ */
public class SegmentReferenceLimitTestIT {
- private static final Logger LOG = LoggerFactory.getLogger(SegmentReferenceLimitTestIT.class);
+ private static final Logger LOG = LoggerFactory
+ .getLogger(SegmentReferenceLimitTestIT.class);
+ private static final boolean ENABLED = Boolean
+ .getBoolean(SegmentReferenceLimitTestIT.class.getSimpleName());
private File directory;
@Before
public void setUp() throws IOException {
- directory = File.createTempFile("SegmentReferenceLimitTestIT", "dir", new File("target"));
+ assumeTrue(ENABLED);
+ directory = File.createTempFile(getClass().getSimpleName(), "dir",
+ new File("target"));
directory.delete();
directory.mkdir();
}
@@ -57,24 +75,18 @@ public class SegmentReferenceLimitTestIT
@After
public void cleanDir() {
try {
- FileUtils.deleteDirectory(directory);
+ if (directory != null) {
+ deleteDirectory(directory);
+ }
} catch (IOException e) {
LOG.error("Error cleaning directory", e);
}
}
- /**
- * OAK-2294 Corrupt repository after concurrent version operations
- *
- * TODO Test is currently ignored because of how memory intensive it is
- *
- * @see <a
- * href="https://issues.apache.org/jira/browse/OAK-2294">OAK-2294</a>
- */
@Test
- @Ignore
public void corruption() throws IOException, CommitFailedException, ExecutionException, InterruptedException {
- FileStore fileStore = new FileStore(directory, 1, 0, false);
+ FileStore fileStore = newFileStore(directory).withMaxFileSize(1)
+ .withNoCache().withMemoryMapping(true).create();
SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
NodeBuilder root = nodeStore.getRoot().builder();