Author: mduerig
Date: Tue Jul 7 12:44:51 2015
New Revision: 1689646
URL: http://svn.apache.org/r1689646
Log:
OAK-2849: Improve revision gc on SegmentMK
SegmentCompactionIT improvement: make the maximal number of write operations
per scheduled writer configurable
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java?rev=1689646&r1=1689645&r2=1689646&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionIT.java
Tue Jul 7 12:44:51 2015
@@ -140,6 +140,7 @@ public class SegmentCompactionIT {
private volatile int maxBlobSize = 1000000;
private volatile int maxStringSize = 10000;
private volatile int maxReferences = 10;
+ private volatile int maxWriteOps = 10000;
private volatile int maxNodeCount = 1000;
private volatile int maxPropertyCount = 1000;
private volatile int nodeRemoveRatio = 10;
@@ -286,7 +287,7 @@ public class SegmentCompactionIT {
private void scheduleWriter() {
if (writers.size() < maxWriters) {
final ListenableScheduledFuture<Void> writer = scheduler.schedule(
- new RandomWriter(rnd, nodeStore, rnd.nextInt(500), "W" +
rnd.nextInt(5)),
+ new RandomWriter(rnd, nodeStore, rnd.nextInt(maxWriteOps),
"W" + rnd.nextInt(5)),
rnd.nextInt(30), SECONDS);
writers.add(writer);
addCallback(writer, new FutureCallback<Void>() {
@@ -761,6 +762,17 @@ public class SegmentCompactionIT {
}
@Override
+ public void setMaxWriteOps(int count) {
+ checkArgument(count >= 0);
+ maxWriteOps = count;
+ }
+
+ @Override
+ public int getMaxWriteOps() {
+ return maxWriteOps;
+ }
+
+ @Override
public void setMaxNodeCount(int count) {
checkArgument(count >= 0);
maxNodeCount = count;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java?rev=1689646&r1=1689645&r2=1689646&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentCompactionMBean.java
Tue Jul 7 12:44:51 2015
@@ -140,6 +140,17 @@ public interface SegmentCompactionMBean
int getMaxReferences();
/**
+ * Maximal number of write operations per scheduled writer
+ * @param count maximal number of operations
+ */
+ void setMaxWriteOps(int count);
+
+ /**
+ * @return maximal number of operations
+ */
+ int getMaxWriteOps();
+
+ /**
* Set the maximal number of child node of a node
* @param count maximal number of child nodes
*/
