You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/29 02:02:42 UTC
[lucene-solr] 09/27: @426 Keep battling this test.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 94be00d6534b475aaa05e6b15be2a0dd29790ff0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 28 10:51:13 2020 -0500
@426 Keep battling this test.
---
solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java | 6 ++++--
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java b/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
index fc7c835..8ca9aee 100644
--- a/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/OrderedExecutorTest.java
@@ -19,7 +19,9 @@ package org.apache.solr.util;
import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
@@ -214,8 +216,8 @@ public class OrderedExecutorTest extends SolrTestCase {
N = 15;
}
- Map<Integer, Integer> base = new ConcurrentHashMap<>(100);
- Map<Integer, Integer> run = new ConcurrentHashMap<>(100);
+ Map<Integer, Integer> base = new ConcurrentHashMap<>(TEST_NIGHTLY ? 1000 : 55);
+ Map<Integer, Integer> run = new ConcurrentHashMap<>(TEST_NIGHTLY ? 1000 : 55);
for (int i = 0; i < N; i++) {
base.put(i, i);
run.put(i, i);
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
index ef50fd5..03db4ad 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -66,7 +66,8 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter {
}
// randomizedtesting claims this leaks, but the thread is already TERMINATED state
- if (threadName.startsWith("executeInOrderTest")) {
+ // I think it can be resolved, but for now ...
+ if (threadName.startsWith("executeInOrderTest") || threadName.startsWith("testStress")) {
return true;
}