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 re...@apache.org on 2019/02/28 12:12:40 UTC
svn commit: r1854520 - in /jackrabbit/oak/branches/1.10: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/
Author: reschke
Date: Thu Feb 28 12:12:39 2019
New Revision: 1854520
URL: http://svn.apache.org/viewvc?rev=1854520&view=rev
Log:
OAK-8088: Add refresh head revision time to background update stats (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 28 12:12:39 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854468
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854058,1854113,1854462,1854466,1854468
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java?rev=1854520&r1=1854519&r2=1854520&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BackgroundWriteStats.java Thu Feb 28 12:12:39 2019
@@ -23,6 +23,7 @@ class BackgroundWriteStats {
long clean;
long split;
+ long refresh;
long sweep;
long lock;
long write;
@@ -34,6 +35,7 @@ class BackgroundWriteStats {
public String toString() {
return "clean:" + clean +
", split:" + split +
+ ", refresh:" + refresh +
", sweep:" + sweep +
", lock:" + lock +
", write:" + write +
Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1854520&r1=1854519&r2=1854520&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Feb 28 12:12:39 2019
@@ -2036,9 +2036,12 @@ public final class DocumentNodeStore
// split documents (does not create new revisions)
backgroundSplit();
long splitTime = clock.getTime() - time;
+ time = clock.getTime();
maybeRefreshHeadRevision();
+ long refreshTime = clock.getTime() - time;
// write back pending updates to _lastRev
stats = backgroundWrite();
+ stats.refresh = refreshTime;
stats.split = splitTime;
stats.clean = cleanTime;
stats.totalWriteTime = clock.getTime() - start;