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/17 15:22:38 UTC
[lucene-solr] 04/18: @839 More explicit scheduled thread pool
config.
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 1e54d365f3d9ec251a8cd9eb3f9d5e8377257f0c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 16 18:22:49 2020 -0500
@839 More explicit scheduled thread pool config.
---
.../org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java | 1 +
.../src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java | 1 +
.../src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java | 1 +
.../src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java | 1 +
solr/core/src/java/org/apache/solr/update/CommitTracker.java | 1 +
.../org/apache/solr/common/util/SolrScheduledExecutorScheduler.java | 2 ++
6 files changed, 7 insertions(+)
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java
index f13bd27..7e0e7dd 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java
@@ -74,6 +74,7 @@ public class SchedulerMetricsCollector implements Closeable {
this.timeUnit = timeUnit;
scheduler.setRemoveOnCancelPolicy(true);
scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ scheduler.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
}
public void start() {
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
index 8dc233e..558774d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
@@ -145,6 +145,7 @@ public class ScheduledTriggers implements Closeable {
new SolrNamedThreadFactory("ScheduledTrigger"));
scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ scheduledThreadPoolExecutor.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
actionExecutor = ExecutorUtil.newMDCAwareSingleThreadExecutor(new SolrNamedThreadFactory("AutoscalingActionExecutor"));
this.cloudManager = cloudManager;
this.stateManager = cloudManager.getDistribStateManager();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
index 0655305..af875f1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
@@ -226,6 +226,7 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
new SolrNamedThreadFactory("MetricsHistoryHandler", true));
collectService.setRemoveOnCancelPolicy(true);
collectService.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ collectService.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
scheduledFuture = collectService.scheduleWithFixedDelay(() -> collectMetrics(),
timeSource.convertDelay(TimeUnit.SECONDS, collectPeriod, TimeUnit.MILLISECONDS),
timeSource.convertDelay(TimeUnit.SECONDS, collectPeriod, TimeUnit.MILLISECONDS),
diff --git a/solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java b/solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java
index b6439b0..221e8ca 100644
--- a/solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java
+++ b/solr/core/src/java/org/apache/solr/metrics/rrd/SolrRrdBackendFactory.java
@@ -115,6 +115,7 @@ public class SolrRrdBackendFactory extends RrdBackendFactory implements SolrClos
new SolrNamedThreadFactory("SolrRrdBackendFactory", true));
syncService.setRemoveOnCancelPolicy(true);
syncService.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ syncService.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
scheduledFuture = syncService.scheduleWithFixedDelay(() -> maybeSyncBackends(),
timeSource.convertDelay(TimeUnit.SECONDS, syncPeriod, TimeUnit.MILLISECONDS),
timeSource.convertDelay(TimeUnit.SECONDS, syncPeriod, TimeUnit.MILLISECONDS),
diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
index df22dad..1db1f74 100644
--- a/solr/core/src/java/org/apache/solr/update/CommitTracker.java
+++ b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
@@ -96,6 +96,7 @@ public final class CommitTracker implements Runnable, Closeable {
scheduler.setRemoveOnCancelPolicy(true);
scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ scheduler.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
log.info("{} AutoCommit: {}", name, this);
assert ObjectReleaseTracker.track(this);
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
index 8341090..e0da1aa 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/SolrScheduledExecutorScheduler.java
@@ -93,6 +93,8 @@ public class SolrScheduledExecutorScheduler extends AbstractLifeCycle implements
return thread;
});
scheduler.setRemoveOnCancelPolicy(true);
+ scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+ scheduler.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
super.doStart();
}