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/09/20 08:50:04 UTC
svn commit: r1841443 -
/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
Author: mduerig
Date: Thu Sep 20 08:50:04 2018
New Revision: 1841443
URL: http://svn.apache.org/viewvc?rev=1841443&view=rev
Log:
OAK-7771: Make mmap and segment cache size configurable in SegmentCompactionIT
Use -Dmmap and -Dsegment-cache to set
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java?rev=1841443&r1=1841442&r2=1841443&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java Thu Sep 20 08:50:04 2018
@@ -27,13 +27,16 @@ import static com.google.common.util.con
import static com.google.common.util.concurrent.Futures.dereference;
import static com.google.common.util.concurrent.Futures.immediateCancelledFuture;
import static com.google.common.util.concurrent.MoreExecutors.listeningDecorator;
+import static java.lang.Boolean.parseBoolean;
import static java.lang.Integer.MAX_VALUE;
+import static java.lang.Integer.getInteger;
import static java.lang.String.valueOf;
import static java.lang.System.getProperty;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.apache.jackrabbit.oak.segment.SegmentCache.DEFAULT_SEGMENT_CACHE_MB;
import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType.FULL;
import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType.TAIL;
import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.defaultGCOptions;
@@ -138,6 +141,10 @@ public class SegmentCompactionIT {
private static final boolean ENABLED =
SegmentCompactionIT.class.getSimpleName().equals(getProperty("test"));
+ private static final boolean MMAP = parseBoolean(getProperty("mmap", "true"));
+
+ private static final int SEGMENT_CACHE_SIZE = getInteger("segment-cache", DEFAULT_SEGMENT_CACHE_MB);
+
private static final Logger LOG = LoggerFactory.getLogger(SegmentCompactionIT.class);
private final MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
@@ -162,8 +169,8 @@ public class SegmentCompactionIT {
private volatile ListenableFuture<?> compactor = immediateCancelledFuture();
private volatile ReadWriteLock compactionLock = null;
- private volatile int maxReaders = Integer.getInteger("SegmentCompactionIT.maxReaders", 10);
- private volatile int maxWriters = Integer.getInteger("SegmentCompactionIT.maxWriters", 10);
+ private volatile int maxReaders = getInteger("SegmentCompactionIT.maxReaders", 10);
+ private volatile int maxWriters = getInteger("SegmentCompactionIT.maxWriters", 10);
private volatile long maxStoreSize = 200000000000L;
private volatile int maxBlobSize = 1000000;
private volatile int maxStringSize = 100;
@@ -255,7 +262,8 @@ public class SegmentCompactionIT {
MetricStatisticsProvider statisticsProvider = new MetricStatisticsProvider(mBeanServer, executor);
FileStoreBuilder builder = fileStoreBuilder(folder.getRoot());
fileStore = builder
- .withMemoryMapping(true)
+ .withMemoryMapping(MMAP)
+ .withSegmentCacheSize(SEGMENT_CACHE_SIZE)
.withGCMonitor(gcMonitor)
.withGCOptions(gcOptions)
.withIOMonitor(new MetricsIOMonitor(statisticsProvider))