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/09/22 14:43:33 UTC
svn commit: r1704610 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment:
SegmentCompactionIT.java SegmentCompactionMBean.java
Author: mduerig
Date: Tue Sep 22 12:43:29 2015
New Revision: 1704610
URL: http://svn.apache.org/viewvc?rev=1704610&view=rev
Log:
OAK-2849: Improve revision gc on SegmentMK
Record and report the number of commits in SegmentCompactionIT
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=1704610&r1=1704609&r2=1704610&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 Sep 22 12:43:29 2015
@@ -56,6 +56,7 @@ import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -460,6 +461,7 @@ public class SegmentCompactionIT {
? new CompositeHook(new ConflictHook(DefaultConflictHandler.OURS))
: new CompositeHook(new ConflictHook(DefaultConflictHandler.THEIRS));
nodeStore.merge(root, commitHook, CommitInfo.EMPTY);
+ segmentCompactionMBean.committed();
} catch (CommitFailedException e) {
LOG.warn("Commit failed: {}", e.getMessage());
}
@@ -748,6 +750,8 @@ public class SegmentCompactionIT {
}
private class SegmentCompactionITMBean extends AnnotatedStandardMBean implements SegmentCompactionMBean {
+ private final AtomicLong commitCount = new AtomicLong();
+
private String lastError;
SegmentCompactionITMBean() {
@@ -1038,6 +1042,11 @@ public class SegmentCompactionIT {
return lastError;
}
+ @Override
+ public long getCommitCount() {
+ return commitCount.get();
+ }
+
void error(String message, Throwable t) {
if (!(t instanceof CancellationException)) {
StringWriter sw = new StringWriter();
@@ -1048,5 +1057,9 @@ public class SegmentCompactionIT {
LOG.error(message, t);
}
}
+
+ void committed() {
+ commitCount.incrementAndGet();
+ }
}
}
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=1704610&r1=1704609&r2=1704610&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 Sep 22 12:43:29 2015
@@ -299,4 +299,9 @@ public interface SegmentCompactionMBean
* @return last error
*/
String getLastError();
+
+ /**
+ * @return Number of commits
+ */
+ long getCommitCount();
}