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/09/02 04:37:14 UTC
[lucene-solr] branch reference_impl_dev updated (53ecc16 -> 66c6d72)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 53ecc16 @694 Return some ignored tests to core.
new 8fcfcaf @695 Address rare test thread leak.
new 66c6d72 @696 Trying to go after rare case we can stop watching an collection we are still interested in.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java | 2 --
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 4 ++++
3 files changed, 5 insertions(+), 3 deletions(-)
[lucene-solr] 02/02: @696 Trying to go after rare case we can stop
watching an collection we are still interested in.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 66c6d729e87ddb0ac089ee25b334d9f0a75be056
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 23:28:25 2020 -0500
@696 Trying to go after rare case we can stop watching an collection we are still interested in.
---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index e204bd0..78704f7 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -252,7 +252,7 @@ public class ZkStateReader implements SolrCloseable {
final Set<T> stateWatchers = ConcurrentHashMap.newKeySet();
public boolean canBeRemoved() {
- return coreRefCount.get() + stateWatchers.size() == 0;
+ return coreRefCount.get() <=0 && stateWatchers.size() <= 0;
}
}
[lucene-solr] 01/02: @695 Address rare test thread leak.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8fcfcaffa50275e3ce1d715524ef2025bcea12f7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 23:27:59 2020 -0500
@695 Address rare test thread leak.
---
solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java | 2 --
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
index 7587846..ccd9f47 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestDistributedMap.java
@@ -66,7 +66,6 @@ public class TestDistributedMap extends SolrTestCaseJ4 {
public void testGet() throws KeeperException, InterruptedException {
SolrZkClient zkClient = zkServer.getZkClient();
-
String path = getAndMakeInitialPath(zkClient);
byte[] data = "data".getBytes(Charset.defaultCharset());
zkClient.makePath(path + "/" + DistributedMap.PREFIX + "foo", data, CreateMode.PERSISTENT, null, false, true);
@@ -183,5 +182,4 @@ public class TestDistributedMap extends SolrTestCaseJ4 {
return path;
}
-
}
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 61691d3..c68dd41 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -69,6 +69,10 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter {
return true;
}
+ if (threadName.startsWith("ConnnectionExpirer")) { // org.apache.solr.cloud.TestDistributedMap.classMethod can leak this in TERMINATED state, should go away with apache httpclient
+ return true;
+ }
+
// HDFS nocommit fix
// if (threadName.startsWith("IPC Parameter Sending Thread ")) { // SOLR-5007
// return true;