Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1583712 -
 /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
Date: Tue, 01 Apr 2014 15:20:57 -0000
To: oak-commits@jackrabbit.apache.org
From: mduerig@apache.org
Message-Id: <20140401152057.D5DAF2388868@eris.apache.org>

Author: mduerig
Date: Tue Apr  1 15:20:57 2014
New Revision: 1583712

URL: http://svn.apache.org/r1583712
Log:
OAK-1659: Improve CommitRateLimiter to delay commits
Remove logging from BackgroundObserver as this is now better handled in subclasses

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java?rev=1583712&r1=1583711&r2=1583712&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java Tue Apr  1 15:20:57 2014
@@ -51,7 +51,6 @@ import org.slf4j.LoggerFactory;
  * to just one change.
  */
 public class BackgroundObserver implements Observer, Closeable {
-    private static final Logger LOG = LoggerFactory.getLogger(BackgroundObserver.class);
 
     /**
      * Signal for the background thread to stop processing changes.
@@ -105,11 +104,6 @@ public class BackgroundObserver implemen
     private boolean full;
 
     /**
-     * Log a warning once when the queue is full. Reset once the queue is back empty.
-     */
-    private volatile boolean warnOnFullQueue = true;
-
-    /**
      * Current background task
      */
     private volatile ListenableFutureTask currentTask = ListenableFutureTask.completed();
@@ -233,10 +227,6 @@ public class BackgroundObserver implemen
         // Try to add this change to the queue without blocking, and
         // mark the queue as full if there wasn't enough space
         full = !queue.offer(change);
-        if (full && warnOnFullQueue) {
-            warnOnFullQueue = false;
-            LOG.warn("Revision queue is full. Further revisions will be compacted.");
-        }
 
         if (!full) {
             // Keep track of the last change added, so we can do the