You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by md...@apache.org on 2022/08/24 15:01:32 UTC
[solr] branch branch_9x updated (1618554f30b -> 9fab5d9135e)
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 1618554f30b SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0 (backport to 9x) (#982)
new d264d0c4c5c Ignore leaked ZK server thread
new 9fab5d9135e SOLR-16349 check for properties file before attempt to open (#979)
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:
.../src/java/org/apache/solr/core/CorePropertiesLocator.java | 10 +++++++---
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 5 +++++
2 files changed, 12 insertions(+), 3 deletions(-)
[solr] 01/02: Ignore leaked ZK server thread
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit d264d0c4c5c65344f923873946d73b7df5c093e0
Author: Mike Drob <md...@apache.org>
AuthorDate: Thu Aug 18 11:15:17 2022 -0500
Ignore leaked ZK server thread
---
.../src/java/org/apache/solr/SolrIgnoredThreadsFilter.java | 5 +++++
1 file changed, 5 insertions(+)
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 085364361d5..a3903e8ceaa 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -77,6 +77,11 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter {
return true;
}
+ // ZOOKEEPER-4608, yes it's spelled with 3 n's
+ if (threadName.equals("ConnnectionExpirer")) {
+ return true;
+ }
+
return threadName.startsWith("closeThreadPool");
}
}
[solr] 02/02: SOLR-16349 check for properties file before attempt to open (#979)
Posted by md...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 9fab5d9135e7154ba5236d97f17463fe2fb8b9a5
Author: Mike Drob <md...@apache.org>
AuthorDate: Wed Aug 24 10:00:12 2022 -0500
SOLR-16349 check for properties file before attempt to open (#979)
---
.../src/java/org/apache/solr/core/CorePropertiesLocator.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
index 9539c340868..48353fde65c 100644
--- a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
+++ b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java
@@ -194,10 +194,14 @@ public class CorePropertiesLocator implements CoresLocator {
}
protected CoreDescriptor buildCoreDescriptor(Path propertiesFile, CoreContainer cc) {
-
- Path instanceDir = propertiesFile.getParent();
- Properties coreProperties = new Properties();
+ if (Files.notExists(propertiesFile)) {
+ // This can happen in tests, see CoreContainer#reloadCoreDescriptor
+ log.info("Could not load core descriptor from {} because it does not exist", propertiesFile);
+ return null;
+ }
try (InputStream fis = Files.newInputStream(propertiesFile)) {
+ Path instanceDir = propertiesFile.getParent();
+ Properties coreProperties = new Properties();
coreProperties.load(new InputStreamReader(fis, StandardCharsets.UTF_8));
String name = createName(coreProperties, instanceDir);
Map<String, String> propMap = new HashMap<>();