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/16 07:09:47 UTC
[lucene-solr] branch reference_impl updated: @196 - Small tweaks,
chasing a thing or two.
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 76857ad @196 - Small tweaks, chasing a thing or two.
76857ad is described below
commit 76857ad976dbd02a6d49258e6fc65239cc59413b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Jul 16 02:09:34 2020 -0500
@196 - Small tweaks, chasing a thing or two.
---
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 8 --------
.../org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java | 1 +
solr/solrj/src/java/org/apache/solr/common/ParWork.java | 4 ++--
3 files changed, 3 insertions(+), 10 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 b86a966..db7848b 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -369,14 +369,6 @@ public class CoreContainer implements Closeable {
updateShardHandler.initializeMetrics(solrMetricsContext, "updateShardHandler");
});
work.addCollect("shard-handlers");
- work.collect(() -> {
-// if (zkClient != null) {
-// zkSys.initZooKeeper(this, cfg.getCloudConfig());
-// }
-// coreConfigService = ConfigSetService.createConfigSetService(cfg, loader, zkSys == null ? null : zkSys.zkController);
-//
-// containerProperties.putAll(cfg.getSolrProperties());
- });
work.addCollect("init");
}
diff --git a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
index 5c02565..933c840 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java
@@ -180,6 +180,7 @@ public class SpatialHeatmapFacetsTest extends BaseDistributedSearchTestCase {
/** Tests JSON Facet module implementation of heatmaps. */
@SuppressWarnings("unchecked")
@Test
+ @Nightly
public void testJsonFacets() throws Exception {
/*
THIS IS THE MOSTLY SAME CODE as above with tweaks to request it using the JSON Facet approach.
diff --git a/solr/solrj/src/java/org/apache/solr/common/ParWork.java b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
index f90e852..bdc760a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/ParWork.java
+++ b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
@@ -65,7 +65,7 @@ public class ParWork implements Closeable {
protected final static ThreadLocal<ExecutorService> THREAD_LOCAL_EXECUTOR = new ThreadLocal<>();
public static volatile int MAXIMUM_POOL_SIZE;
- public static final long KEEP_ALIVE_TIME = 3;
+ public static final long KEEP_ALIVE_TIME = 10;
public static volatile int CAPACITY;
private Set<Object> collectSet = null;
@@ -506,7 +506,7 @@ public class ParWork implements Closeable {
for (Future<Object> future : results) {
if (!future.isDone() || future.isCancelled()) {
- log.warn("A task did nor finish isDone={} isCanceled={}", future.isDone(), future.isCancelled());
+ log.warn("A task did not finish isDone={} isCanceled={}", future.isDone(), future.isCancelled());
// throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "A task did nor finish" +future.isDone() + " " + future.isCancelled());
}
}