svn commit: r1771705 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/...

mduerig Mon, 28 Nov 2016 02:42:36 -0800

Author: mduerig
Date: Mon Nov 28 10:42:16 2016
New Revision: 1771705

URL: http://svn.apache.org/viewvc?rev=1771705&view=rev
Log:
OAK-5162: Increase default size of the observation queue from 1000 to 10000


Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java?rev=1771705&r1=1771704&r2=1771705&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
 Mon Nov 28 10:42:16 2016
@@ -19,6 +19,12 @@
 
 package org.apache.jackrabbit.oak.plugins.document.secondary;
 
+import static java.util.Arrays.asList;
+import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toBoolean;
+import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toInteger;
+import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toStringArray;
+import static 
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
+
 import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
@@ -57,12 +63,6 @@ import org.osgi.framework.ServiceRegistr
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static java.util.Arrays.asList;
-import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toBoolean;
-import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toInteger;
-import static org.apache.jackrabbit.oak.commons.PropertiesUtil.toStringArray;
-import static 
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
-
 @Component(label = "Apache Jackrabbit Oak DocumentNodeStateCache Provider",
         metatype = true,
         immediate = true,
@@ -108,7 +108,7 @@ public class SecondaryStoreCacheService
     )
     private static final String PROP_ASYNC_OBSERVER = "enableAsyncObserver";
 
-    private static final int PROP_OBSERVER_QUEUE_SIZE_DEFAULT = 1000;
+    private static final int PROP_OBSERVER_QUEUE_SIZE_DEFAULT = 
BackgroundObserver.DEFAULT_QUEUE_SIZE;
     @Property(
             intValue = PROP_OBSERVER_QUEUE_SIZE_DEFAULT,
             label = "Observer queue size",

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=1771705&r1=1771704&r2=1771705&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
 Mon Nov 28 10:42:16 2016
@@ -55,6 +55,8 @@ import org.slf4j.LoggerFactory;
  */
 public class BackgroundObserver implements Observer, Closeable {
 
+    public final static int DEFAULT_QUEUE_SIZE = 10000;
+
     /**
      * Signal for the background thread to stop processing changes.
      */
@@ -179,7 +181,7 @@ public class BackgroundObserver implemen
     public BackgroundObserver(
             @Nonnull Observer observer,
             @Nonnull Executor executor) {
-        this(observer, executor, 1000);
+        this(observer, executor, DEFAULT_QUEUE_SIZE);
     }
 
     /**

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1771705&r1=1771704&r2=1771705&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
 Mon Nov 28 10:42:16 2016
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.version.VersionHook;
 import org.apache.jackrabbit.oak.query.QueryEngineSettings;
 import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
+import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.CompositeConflictHandler;
 import org.apache.jackrabbit.oak.spi.commit.Editor;
@@ -77,7 +78,7 @@ import org.apache.jackrabbit.oak.spi.whi
  * {@link Jcr#createRepository()}.</p>
  */
 public class Jcr {
-    public static final int DEFAULT_OBSERVATION_QUEUE_LENGTH = 1000;
+    public static final int DEFAULT_OBSERVATION_QUEUE_LENGTH = 
BackgroundObserver.DEFAULT_QUEUE_SIZE;
 
     private final Oak oak;
 

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java?rev=1771705&r1=1771704&r2=1771705&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/osgi/RepositoryManager.java
 Mon Nov 28 10:42:16 2016
@@ -38,6 +38,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
 import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
 import org.apache.jackrabbit.oak.plugins.observation.CommitRateLimiter;
+import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -63,7 +64,7 @@ import org.osgi.framework.ServiceRegistr
         )
 })
 public class RepositoryManager {
-    private static final int DEFAULT_OBSERVATION_QUEUE_LENGTH = 1000;
+    private static final int DEFAULT_OBSERVATION_QUEUE_LENGTH = 
BackgroundObserver.DEFAULT_QUEUE_SIZE;
     private static final boolean DEFAULT_COMMIT_RATE_LIMIT = false;
     private static final boolean DEFAULT_FAST_QUERY_RESULT_SIZE = false;

svn commit: r1771705 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/...

Reply via email to