svn commit: r1783105 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java

[catholicon]

Author: catholicon
Date: Wed Feb 15 14:08:58 2017
New Revision: 1783105

URL: http://svn.apache.org/viewvc?rev=1783105&view=rev
Log:
OAK-5626: ChangeProcessor doesn't reset 'blocking' flag when items from queue 
gets removed and commit-rate-limiter is null

Changed default warn interval to 30 minutes. Also update warn log to state 
interval in minutes.

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1783105&r1=1783104&r2=1783105&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
 Wed Feb 15 14:08:58 2017
@@ -124,7 +124,7 @@ class ChangeProcessor implements Filteri
      * Note, the command line parameter is wait interval in minutes.
      */
     static long QUEUE_FULL_WARN_INTERVAL = TimeUnit.MINUTES.toMillis(Integer
-            .getInteger("oak.observation.full-queue.warn.interval", 10));
+            .getInteger("oak.observation.full-queue.warn.interval", 30));
     static Clock clock = Clock.SIMPLE;
 
     // OAK-4533: make DELAY_THRESHOLD and MAX_DELAY adjustable - using 
System.properties for now
@@ -371,9 +371,9 @@ class ChangeProcessor implements Filteri
             private void logQueueFullWarning(String message) {
                 long currTime = clock.getTime();
                 if (lastQueueFullWarnTimestamp + QUEUE_FULL_WARN_INTERVAL < 
currTime) {
-                    LOG.warn("{} Suppressing further such cases for {} 
seconds.",
+                    LOG.warn("{} Suppressing further such cases for {} 
minutes.",
                             message,
-                            
TimeUnit.MILLISECONDS.toSeconds(QUEUE_FULL_WARN_INTERVAL));
+                            
TimeUnit.MILLISECONDS.toMinutes(QUEUE_FULL_WARN_INTERVAL));
                     lastQueueFullWarnTimestamp = currTime;
                 } else {
                     LOG.debug(message);