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 da...@apache.org on 2014/07/24 11:41:07 UTC
svn commit: r1613050 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
Author: davide
Date: Thu Jul 24 09:41:06 2014
New Revision: 1613050
URL: http://svn.apache.org/r1613050
Log:
OAK-1892 - OrderedIndexConcurrentClusterIT takes too long
average run of the test on local 2.5mins
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java?rev=1613050&r1=1613049&r2=1613050&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/OrderedContentMirrorStoreStrategy.java Thu Jul 24 09:41:06 2014
@@ -1044,7 +1044,7 @@ public class OrderedContentMirrorStoreSt
for (int i = vv.size(); i <= OrderedIndex.LANES; i++) {
vv.add("");
}
- values = vv.toArray(new String[0]);
+ values = vv.toArray(new String[vv.size()]);
}
} else {
values = Iterables.toArray(EMPTY_NEXT, String.class);
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java?rev=1613050&r1=1613049&r2=1613050&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderedIndexConcurrentClusterIT.java Thu Jul 24 09:41:06 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;
@@ -54,7 +53,6 @@ public class OrderedIndexConcurrentClust
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;
private static final Credentials ADMIN = new SimpleCredentials("admin", "admin".toCharArray());
private static final String INDEX_NODE_NAME = "lastModified";
@@ -69,7 +67,11 @@ public class OrderedIndexConcurrentClust
@BeforeClass
public static void mongoDBAvailable() {
- Assume.assumeTrue(OakMongoMKRepositoryStub.isMongoDBAvailable());
+ final boolean mongoAvailable = OakMongoMKRepositoryStub.isMongoDBAvailable();
+ if (!mongoAvailable) {
+ LOG.warn("Mongo DB is not available. Skipping the test");
+ }
+ Assume.assumeTrue(mongoAvailable);
}
private static MongoConnection createConnection() throws Exception {
@@ -212,10 +214,9 @@ public class OrderedIndexConcurrentClust
}
}
- @Ignore("OAK-1892")
@Test
public void deleteConcurrently() throws Exception {
- final int loop = LOOP;
+ final int loop = 1400;
final int count = COUNT;
final int clusters = NUM_CLUSTER_NODES;