You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2014/06/12 16:29:49 UTC

svn commit: r1602177 - in /jackrabbit/oak/branches/1.0: ./ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java

Author: mreutegg
Date: Thu Jun 12 14:29:49 2014
New Revision: 1602177

URL: http://svn.apache.org/r1602177
Log:
OAK-1886: OOM in org.apache.jackrabbit.oak.jcr.OrderedIndexConcurrentClusterIT::deleteConcurrently()

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1602174

Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java?rev=1602177&r1=1602176&r2=1602177&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java Thu Jun 12 14:29:49 2014
@@ -44,7 +44,6 @@ import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,6 +51,7 @@ import org.slf4j.LoggerFactory;
 public class OrderedIndexConcurrentClusterIT {
     private static final Logger LOG = LoggerFactory.getLogger(OrderedIndexConcurrentClusterIT.class);
     
+    private static final long CACHE_SIZE = 32 * 1024 * 1024;
     private static final int NUM_CLUSTER_NODES = 5;
     private static final int LOOP = 2800;
     private static final int COUNT = 5;
@@ -211,7 +211,6 @@ public class OrderedIndexConcurrentClust
         }
     }
 
-    @Ignore("OAK-1886")
     @Test
     public void deleteConcurrently() throws Exception {
         final int loop = LOOP;
@@ -225,6 +224,7 @@ public class OrderedIndexConcurrentClust
         // creating instances
         for (int i = 1; i <= clusters; i++) {
             DocumentMK mk = new DocumentMK.Builder()
+                    .memoryCacheSize(CACHE_SIZE)
                     .setMongoDB(createConnection().getDB())
                     .setClusterId(i).open();
             mks.add(mk);