svn commit: r1732475 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache: NodeCache.java PersistentCacheStats.java

[thomasm]

Author: thomasm
Date: Fri Feb 26 13:21:32 2016
New Revision: 1732475

URL: http://svn.apache.org/viewvc?rev=1732475&view=rev
Log:
OAK-3850 Collect and expose Persistent Cache stats

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCacheStats.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java?rev=1732475&r1=1732474&r2=1732475&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
 Fri Feb 26 13:21:32 2016
@@ -116,11 +116,6 @@ class NodeCache<K, V> implements Cache<K
     }
 
     private void broadcast(final K key, final V value) {
-        long memory = 0L;
-        memory += (key == null ? 0L: keyType.getMemory(key));
-        memory += (value == null ? 0L: valueType.getMemory(value));
-        stats.markBytesWritten(memory);
-
         cache.broadcast(type, new Function<WriteBuffer, Void>() {
             @Override
             @Nullable
@@ -189,7 +184,6 @@ class NodeCache<K, V> implements Cache<K
     public void put(K key, V value) {
         memCache.put(key, value);
         broadcast(key, value);
-        stats.markPut();
     }
 
     @SuppressWarnings("unchecked")
@@ -261,6 +255,12 @@ class NodeCache<K, V> implements Cache<K
         if (EVICTION_CAUSES.contains(cause) && value != null) { 
             // invalidations are handled separately
             writerQueue.addPut(key, value);
+
+            long memory = 0L;
+            memory += (key == null ? 0L: keyType.getMemory(key));
+            memory += (value == null ? 0L: valueType.getMemory(value));
+            stats.markBytesWritten(memory);
+            stats.markPut();
         }
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCacheStats.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCacheStats.java?rev=1732475&r1=1732474&r2=1732475&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCacheStats.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCacheStats.java
 Fri Feb 26 13:21:32 2016
@@ -41,7 +41,7 @@ public class PersistentCacheStats extend
     private static final Boolean ENABLE_READ_TIMER;
     private static final Boolean ENABLE_LOAD_TIMER;
     static {
-        String enableReadTimer = 
System.getProperty("PersistentCacheStats.readTimer", "true");
+        String enableReadTimer = 
System.getProperty("PersistentCacheStats.readTimer", "false");
         String enableLoadTimer = 
System.getProperty("PersistentCacheStats.loadTimer", "false");
         ENABLE_READ_TIMER = Boolean.parseBoolean(enableReadTimer);
         ENABLE_LOAD_TIMER = Boolean.parseBoolean(enableLoadTimer);