svn commit: r1788842 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: BackgroundWriteStats.java DocumentNodeStoreStats.java

[mr...@apache.org]

Author: mreutegg
Date: Mon Mar 27 08:11:58 2017
New Revision: 1788842

URL: http://svn.apache.org/viewvc?rev=1788842&view=rev
Log:
OAK-3712: Clean up old and uncommitted changes

Introduce stats for sweeper

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreStats.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java?rev=1788842&r1=1788841&r2=1788842&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java Mon Mar 27 08:11:58 2017
@@ -23,6 +23,7 @@ class BackgroundWriteStats {
 
     long clean;
     long split;
+    long sweep;
     long lock;
     long write;
     long num;
@@ -32,7 +33,8 @@ class BackgroundWriteStats {
     @Override
     public String toString() {
         return "clean:" + clean +
-                ", split:" + split+
+                ", split:" + split +
+                ", sweep:" + sweep +
                 ", lock:" + lock +
                 ", write:" + write +
                 ", num:" + num +

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreStats.java?rev=1788842&r1=1788841&r2=1788842&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreStats.java Mon Mar 27 08:11:58 2017
@@ -40,6 +40,7 @@ public class DocumentNodeStoreStats impl
     private static final String BGW_CLEAN = "DOCUMENT_NS_BGW_CLEAN";
     private static final String BGW_SPLIT = "DOCUMENT_NS_BGW_SPLIT";
     private static final String BGW_WRITE = "DOCUMENT_NS_BGW_LOCK";
+    private static final String BGW_SWEEP = "DOCUMENT_NS_BGW_SWEEP";
     static final String BGW_NUM = "DOCUMENT_NS_BGW_NUM";
     static final String BGW_NUM_WRITES_RATE = "DOCUMENT_NS_BGW_NUM_WRITE_RATE";
     private static final String BGW_TOTAL = "DOCUMENT_NS_BGW_TOTAL_TIME";
@@ -63,6 +64,7 @@ public class DocumentNodeStoreStats impl
 
     private final TimerStats writeClean;
     private final TimerStats writeSplit;
+    private final TimerStats writeSweep;
     private final HistogramStats writeNum;
     private final TimerStats writeWrite;
     private final TimerStats writeTotal;
@@ -89,6 +91,7 @@ public class DocumentNodeStoreStats impl
 
         writeClean = sp.getTimer(BGW_CLEAN, StatsOptions.METRICS_ONLY);
         writeSplit = sp.getTimer(BGW_SPLIT, StatsOptions.METRICS_ONLY);
+        writeSweep = sp.getTimer(BGW_SWEEP, StatsOptions.METRICS_ONLY);
         writeWrite = sp.getTimer(BGW_WRITE, StatsOptions.METRICS_ONLY);
         writeTotal = sp.getTimer(BGW_TOTAL, StatsOptions.METRICS_ONLY);
         writeNum = sp.getHistogram(BGW_NUM, StatsOptions.METRICS_ONLY);
@@ -121,6 +124,7 @@ public class DocumentNodeStoreStats impl
     public void doneBackgroundUpdate(BackgroundWriteStats stats) {
         writeClean.update(stats.clean, TimeUnit.MILLISECONDS);
         writeSplit.update(stats.split, TimeUnit.MILLISECONDS);
+        writeSweep.update(stats.sweep, TimeUnit.MILLISECONDS);
         writeWrite.update(stats.write, TimeUnit.MILLISECONDS);
         writeTotal.update(stats.totalWriteTime, TimeUnit.MILLISECONDS);