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/14 17:28:34 UTC
[lucene-solr] branch reference_impl updated: #151 - Fine, hack it.
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
The following commit(s) were added to refs/heads/reference_impl by this push:
new 68c3ffc #151 - Fine, hack it.
68c3ffc is described below
commit 68c3ffc169824489cfd3aa3d833866318b5a3bd5
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 12:28:00 2020 -0500
#151 - Fine, hack it.
---
.../java/org/apache/solr/core/CoreContainer.java | 25 +++++++++++++++-------
.../apache/solr/schema/CustomAnalyzerStrField.java | 2 +-
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index b1d2d44..bbcfba6 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -193,10 +193,7 @@ public class CoreContainer implements Closeable {
private volatile UpdateShardHandler updateShardHandler;
- private final static ThreadPoolExecutor solrCoreLoadExecutor = new ExecutorUtil.MDCAwareThreadPoolExecutor(0, Integer.MAX_VALUE,
- 3, TimeUnit.SECONDS,
- new SynchronousQueue<>(),
- new SolrNamedThreadFactory("SolrCoreLoader"));
+ private volatile static ThreadPoolExecutor solrCoreLoadExecutor;
private final OrderedExecutor replayUpdatesExecutor;
@@ -387,12 +384,24 @@ public class CoreContainer implements Closeable {
work.addCollect("init");
}
- if (zkClient != null) {
- zkSys.initZooKeeper(this, cfg.getCloudConfig());
+ if (zkClient != null) {
+ zkSys.initZooKeeper(this, cfg.getCloudConfig());
+ }
+ coreConfigService = ConfigSetService.createConfigSetService(cfg, loader, zkSys == null ? null : zkSys.zkController);
+
+ containerProperties.putAll(cfg.getSolrProperties());
+
+ if (solrCoreLoadExecutor == null) {
+ synchronized (CoreContainer.class) {
+ if (solrCoreLoadExecutor == null) {
+ solrCoreLoadExecutor = new ExecutorUtil.MDCAwareThreadPoolExecutor(0, Integer.MAX_VALUE,
+ 3, TimeUnit.SECONDS,
+ new SynchronousQueue<>(),
+ new SolrNamedThreadFactory("SolrCoreLoader"));
}
- coreConfigService = ConfigSetService.createConfigSetService(cfg, loader, zkSys == null ? null : zkSys.zkController);
+ }
+ }
- containerProperties.putAll(cfg.getSolrProperties());
}
@SuppressWarnings({"unchecked"})
diff --git a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java
index e837e5d..2d2b289 100644
--- a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java
+++ b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java
@@ -39,7 +39,7 @@ public class CustomAnalyzerStrField extends StrField {
private final Analyzer queryAnalyzer;
public CustomAnalyzerStrField() {
- Random r = LuceneTestCase.random();
+ Random r = new Random();
// two arg constructor
Analyzer a2 = new TokenizerChain