svn commit: r1829824 - /jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java

[mreutegg]

Author: mreutegg
Date: Mon Apr 23 07:40:13 2018
New Revision: 1829824

URL: http://svn.apache.org/viewvc?rev=1829824&view=rev
Log:
OAK-7401: Changes kept in memory when update limit is hit in commit hook

Use an explicit update limit of 10000 to prevent conflict on merge

Modified:
    
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java

Modified: 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java?rev=1829824&r1=1829823&r2=1829824&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java
 Mon Apr 23 07:40:13 2018
@@ -94,6 +94,7 @@ public class AtomicCompositeMergeTest {
             DocumentNodeStore docNodeStore = new DocumentMK.Builder()
                     .setDocumentStore(sharedDocStore)
                     .setClusterId(clusterId)
+                    .setUpdateLimit(10000)
                     .getNodeStore();
             closer.register(() -> docNodeStore.dispose());
             NodeStore compositeNodeStore = getCompositeNodeStore(docNodeStore);