Author: thomasm
Date: Thu Nov 3 14:05:02 2016
New Revision: 1767885
URL: http://svn.apache.org/viewvc?rev=1767885&view=rev
Log:
OAK-5057 BulkCreateOrUpdateClusterTest fails sometimes
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1767885&r1=1767884&r2=1767885&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Thu Nov 3 14:05:02 2016
@@ -32,8 +32,12 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BulkCreateOrUpdateClusterTest extends
AbstractMultiDocumentStoreTest {
+
+ final Logger logger = LoggerFactory.getLogger(getClass());
public BulkCreateOrUpdateClusterTest(DocumentStoreFixture dsf) {
super(dsf);
@@ -175,7 +179,10 @@ public class BulkCreateOrUpdateClusterTe
t.start();
}
for (Thread t : threads) {
- t.join(10000);
+ long time = System.currentTimeMillis();
+ t.join(75000);
+ time = System.currentTimeMillis() - time;
+ logger.info("join took " + time + " ms");
if (t.isAlive()) {
fail("Thread hasn't finished in 10s");
}