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/27 14:14:34 UTC
[lucene-solr] branch reference_impl updated (63a44ad -> 7d437f8)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 63a44ad @376 Solid tests please. Solid as the sun.
new 38914b7 @377 Try to avoid NPE.
new 7d437f8 @378 Tighten up test shutdown.
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/java/org/apache/solr/cloud/overseer/NodeMutator.java | 7 +++++--
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
[lucene-solr] 01/02: @377 Try to avoid NPE.
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
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 38914b70ec8b9386fd9f9f34385988d5322192f7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 09:13:54 2020 -0500
@377 Try to avoid NPE.
---
solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
index 1d63264..7819db5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
@@ -44,8 +44,11 @@ public class NodeMutator {
log.debug("DownNode state invoked for node: {}", nodeName);
- for (DocCollection docCollection : clusterState.getCollectionsMap().values()) {
- String collection = docCollection.getName();
+ for (String collection : clusterState.getCollectionStates().keySet()) {
+ DocCollection docCollection = clusterState.getCollectionOrNull(collection);
+ if (docCollection == null) {
+ continue;
+ }
Map<String,Slice> slicesCopy = new LinkedHashMap<>(docCollection.getSlicesMap());
[lucene-solr] 02/02: @378 Tighten up test shutdown.
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
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 7d437f859fe2dbcf0ab43af74627e6247f108f28
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Jul 27 09:14:12 2020 -0500
@378 Tighten up test shutdown.
---
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 3227f92..10e1d57 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -369,15 +369,13 @@ public class SolrTestCase extends LuceneTestCase {
log.info("@After Class ------------------------------------------------------");
try {
- ParWork.closeExecutor();
-
if (null != testExecutor) {
testExecutor.shutdownNow();
}
if (null != testExecutor) {
- ExecutorUtil.shutdownAndAwaitTermination(testExecutor);
+ ParWork.close(testExecutor);
testExecutor = null;
}
@@ -391,6 +389,8 @@ public class SolrTestCase extends LuceneTestCase {
}
}
+ ParWork.closeExecutor();
+
SysStats.getSysStats().stopMonitor();
if (!failed) {