[CORE] Ban all useage of Future#cancel(true)
Interrupting a thread while blocking on an NIO Read / Write Operation can cause a file to be closed due to the interrupts. This can have unpredictable effects when files are open by index readers etc. we should prevent interruptions across the board if possible. Closes #8494
This commit is contained in:
parent
119aa4af20
commit
5c6fe2593e
|
@ -111,3 +111,6 @@ com.ning.compress.lzf.LZFUncompressor#<init>(com.ning.compress.DataHandler, com.
|
||||||
@defaultMessage Spawns a new thread which is solely under lucenes control use ThreadPool#estimatedTimeInMillisCounter instead
|
@defaultMessage Spawns a new thread which is solely under lucenes control use ThreadPool#estimatedTimeInMillisCounter instead
|
||||||
org.apache.lucene.search.TimeLimitingCollector#getGlobalTimerThread()
|
org.apache.lucene.search.TimeLimitingCollector#getGlobalTimerThread()
|
||||||
org.apache.lucene.search.TimeLimitingCollector#getGlobalCounter()
|
org.apache.lucene.search.TimeLimitingCollector#getGlobalCounter()
|
||||||
|
|
||||||
|
@defaultMessage Don't interrupt threads use FutureUtils#cancel(Future<T>) instead
|
||||||
|
java.util.concurrent.Future#cancel(boolean)
|
||||||
|
|
3
pom.xml
3
pom.xml
|
@ -1235,6 +1235,9 @@
|
||||||
<!-- start exclude for Lucene utility class -->
|
<!-- start exclude for Lucene utility class -->
|
||||||
<exclude>org/elasticsearch/common/lucene/Lucene$LenientParser.class</exclude>
|
<exclude>org/elasticsearch/common/lucene/Lucene$LenientParser.class</exclude>
|
||||||
<!-- end exclude for Lucene -->
|
<!-- end exclude for Lucene -->
|
||||||
|
<!-- start exclude for Future utility class -->
|
||||||
|
<exclude>org/elasticsearch/common/util/concurrent/FutureUtils.class</exclude>
|
||||||
|
<!-- end exclude for Future utility class -->
|
||||||
</excludes>
|
</excludes>
|
||||||
<bundledSignatures>
|
<bundledSignatures>
|
||||||
<!-- This will automatically choose the right signatures based on 'targetVersion': -->
|
<!-- This will automatically choose the right signatures based on 'targetVersion': -->
|
||||||
|
|
|
@ -31,6 +31,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit;
|
||||||
import org.elasticsearch.common.unit.ByteSizeValue;
|
import org.elasticsearch.common.unit.ByteSizeValue;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.util.concurrent.EsExecutors;
|
import org.elasticsearch.common.util.concurrent.EsExecutors;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
|
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
|
@ -221,7 +222,7 @@ public class BulkProcessor implements Closeable {
|
||||||
}
|
}
|
||||||
closed = true;
|
closed = true;
|
||||||
if (this.scheduledFuture != null) {
|
if (this.scheduledFuture != null) {
|
||||||
this.scheduledFuture.cancel(false);
|
FutureUtils.cancel(this.scheduledFuture);
|
||||||
this.scheduler.shutdown();
|
this.scheduler.shutdown();
|
||||||
}
|
}
|
||||||
if (bulkRequest.numberOfActions() > 0) {
|
if (bulkRequest.numberOfActions() > 0) {
|
||||||
|
|
|
@ -42,6 +42,7 @@ import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.transport.TransportAddress;
|
import org.elasticsearch.common.transport.TransportAddress;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
import org.elasticsearch.transport.*;
|
import org.elasticsearch.transport.*;
|
||||||
|
|
||||||
|
@ -252,7 +253,7 @@ public class TransportClientNodesService extends AbstractComponent {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
closed = true;
|
closed = true;
|
||||||
nodesSamplerFuture.cancel(true);
|
FutureUtils.cancel(nodesSamplerFuture);
|
||||||
for (DiscoveryNode node : nodes) {
|
for (DiscoveryNode node : nodes) {
|
||||||
transportService.disconnectFromNode(node);
|
transportService.disconnectFromNode(node);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@ import org.elasticsearch.common.component.AbstractComponent;
|
||||||
import org.elasticsearch.common.inject.Inject;
|
import org.elasticsearch.common.inject.Inject;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.index.Index;
|
import org.elasticsearch.index.Index;
|
||||||
import org.elasticsearch.indices.IndexMissingException;
|
import org.elasticsearch.indices.IndexMissingException;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
|
@ -194,9 +195,7 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
|
||||||
public void onResponse(final Response response) {
|
public void onResponse(final Response response) {
|
||||||
if (notified.compareAndSet(false, true)) {
|
if (notified.compareAndSet(false, true)) {
|
||||||
mdLock.release();
|
mdLock.release();
|
||||||
if (future != null) {
|
FutureUtils.cancel(future);
|
||||||
future.cancel(false);
|
|
||||||
}
|
|
||||||
listener.onResponse(response);
|
listener.onResponse(response);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -205,9 +204,7 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
|
||||||
public void onFailure(Throwable t) {
|
public void onFailure(Throwable t) {
|
||||||
if (notified.compareAndSet(false, true)) {
|
if (notified.compareAndSet(false, true)) {
|
||||||
mdLock.release();
|
mdLock.release();
|
||||||
if (future != null) {
|
FutureUtils.cancel(future);
|
||||||
future.cancel(false);
|
|
||||||
}
|
|
||||||
listener.onFailure(t);
|
listener.onFailure(t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ import org.elasticsearch.common.component.AbstractLifecycleComponent;
|
||||||
import org.elasticsearch.common.inject.Inject;
|
import org.elasticsearch.common.inject.Inject;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
|
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
|
@ -83,10 +84,8 @@ public class RoutingService extends AbstractLifecycleComponent<RoutingService> i
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doClose() throws ElasticsearchException {
|
protected void doClose() throws ElasticsearchException {
|
||||||
if (scheduledRoutingTableFuture != null) {
|
FutureUtils.cancel(scheduledRoutingTableFuture);
|
||||||
scheduledRoutingTableFuture.cancel(true);
|
scheduledRoutingTableFuture = null;
|
||||||
scheduledRoutingTableFuture = null;
|
|
||||||
}
|
|
||||||
clusterService.remove(this);
|
clusterService.remove(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,10 +122,8 @@ public class RoutingService extends AbstractLifecycleComponent<RoutingService> i
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (scheduledRoutingTableFuture != null) {
|
FutureUtils.cancel(scheduledRoutingTableFuture);
|
||||||
scheduledRoutingTableFuture.cancel(true);
|
scheduledRoutingTableFuture = null;
|
||||||
scheduledRoutingTableFuture = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doStop() throws ElasticsearchException {
|
protected void doStop() throws ElasticsearchException {
|
||||||
this.reconnectToNodes.cancel(true);
|
FutureUtils.cancel(this.reconnectToNodes);
|
||||||
for (NotifyTimeout onGoingTimeout : onGoingTimeouts) {
|
for (NotifyTimeout onGoingTimeout : onGoingTimeouts) {
|
||||||
onGoingTimeout.cancel();
|
onGoingTimeout.cancel();
|
||||||
onGoingTimeout.listener.onClose();
|
onGoingTimeout.listener.onClose();
|
||||||
|
@ -500,7 +500,7 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
|
||||||
}
|
}
|
||||||
|
|
||||||
public void cancel() {
|
public void cancel() {
|
||||||
future.cancel(false);
|
FutureUtils.cancel(future);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -708,7 +708,7 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
|
||||||
|
|
||||||
if (countDown.countDown()) {
|
if (countDown.countDown()) {
|
||||||
logger.trace("all expected nodes acknowledged cluster_state update (version: {})", clusterStateVersion);
|
logger.trace("all expected nodes acknowledged cluster_state update (version: {})", clusterStateVersion);
|
||||||
ackTimeoutCallback.cancel(true);
|
FutureUtils.cancel(ackTimeoutCallback);
|
||||||
ackedUpdateTask.onAllNodesAcked(lastFailure);
|
ackedUpdateTask.onAllNodesAcked(lastFailure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
package org.elasticsearch.common.metrics;
|
package org.elasticsearch.common.metrics;
|
||||||
|
|
||||||
import jsr166e.LongAdder;
|
import jsr166e.LongAdder;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
|
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
|
@ -117,7 +118,5 @@ public class MeterMetric implements Metric {
|
||||||
return ratePerNs * (double) rateUnit.toNanos(1);
|
return ratePerNs * (double) rateUnit.toNanos(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() { FutureUtils.cancel(future);}
|
||||||
future.cancel(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch licenses this file to you under
|
||||||
|
* the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
* not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.elasticsearch.common.util.concurrent;
|
||||||
|
|
||||||
|
import org.elasticsearch.ElasticsearchIllegalArgumentException;
|
||||||
|
|
||||||
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
public class FutureUtils {
|
||||||
|
|
||||||
|
public static boolean cancel(Future<?> toCancel) {
|
||||||
|
if (toCancel != null) {
|
||||||
|
return toCancel.cancel(false); // this method is a forbidden API since it interrupts threads
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -42,6 +42,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.common.xcontent.*;
|
import org.elasticsearch.common.xcontent.*;
|
||||||
import org.elasticsearch.env.NodeEnvironment;
|
import org.elasticsearch.env.NodeEnvironment;
|
||||||
import org.elasticsearch.index.Index;
|
import org.elasticsearch.index.Index;
|
||||||
|
@ -270,7 +271,7 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
|
||||||
if (newMetaData.hasIndex(danglingIndex)) {
|
if (newMetaData.hasIndex(danglingIndex)) {
|
||||||
logger.debug("[{}] no longer dangling (created), removing", danglingIndex);
|
logger.debug("[{}] no longer dangling (created), removing", danglingIndex);
|
||||||
DanglingIndex removed = danglingIndices.remove(danglingIndex);
|
DanglingIndex removed = danglingIndices.remove(danglingIndex);
|
||||||
removed.future.cancel(false);
|
FutureUtils.cancel(removed.future);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// delete indices that are no longer part of the metadata
|
// delete indices that are no longer part of the metadata
|
||||||
|
|
|
@ -32,6 +32,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
|
||||||
import org.elasticsearch.common.lucene.Lucene;
|
import org.elasticsearch.common.lucene.Lucene;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.index.engine.Engine;
|
import org.elasticsearch.index.engine.Engine;
|
||||||
import org.elasticsearch.index.gateway.IndexShardGateway;
|
import org.elasticsearch.index.gateway.IndexShardGateway;
|
||||||
import org.elasticsearch.index.gateway.IndexShardGatewayRecoveryException;
|
import org.elasticsearch.index.gateway.IndexShardGatewayRecoveryException;
|
||||||
|
@ -336,9 +337,7 @@ public class LocalIndexShardGateway extends AbstractIndexShardComponent implemen
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {
|
public void close() {
|
||||||
if (flushScheduler != null) {
|
FutureUtils.cancel(flushScheduler);
|
||||||
flushScheduler.cancel(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Sync implements Runnable {
|
class Sync implements Runnable {
|
||||||
|
|
|
@ -44,6 +44,7 @@ import org.elasticsearch.common.lucene.Lucene;
|
||||||
import org.elasticsearch.common.metrics.MeanMetric;
|
import org.elasticsearch.common.metrics.MeanMetric;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.index.VersionType;
|
import org.elasticsearch.index.VersionType;
|
||||||
import org.elasticsearch.index.aliases.IndexAliasesService;
|
import org.elasticsearch.index.aliases.IndexAliasesService;
|
||||||
import org.elasticsearch.index.cache.IndexCache;
|
import org.elasticsearch.index.cache.IndexCache;
|
||||||
|
@ -697,14 +698,10 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
|
||||||
synchronized (mutex) {
|
synchronized (mutex) {
|
||||||
indexSettingsService.removeListener(applyRefreshSettings);
|
indexSettingsService.removeListener(applyRefreshSettings);
|
||||||
if (state != IndexShardState.CLOSED) {
|
if (state != IndexShardState.CLOSED) {
|
||||||
if (refreshScheduledFuture != null) {
|
FutureUtils.cancel(refreshScheduledFuture);
|
||||||
refreshScheduledFuture.cancel(true);
|
refreshScheduledFuture = null;
|
||||||
refreshScheduledFuture = null;
|
FutureUtils.cancel(mergeScheduleFuture);
|
||||||
}
|
mergeScheduleFuture = null;
|
||||||
if (mergeScheduleFuture != null) {
|
|
||||||
mergeScheduleFuture.cancel(true);
|
|
||||||
mergeScheduleFuture = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
changeState(IndexShardState.CLOSED, reason);
|
changeState(IndexShardState.CLOSED, reason);
|
||||||
}
|
}
|
||||||
|
@ -954,7 +951,7 @@ public class InternalIndexShard extends AbstractIndexShardComponent implements I
|
||||||
// NOTE: we pass false here so we do NOT attempt Thread.interrupt if EngineRefresher.run is currently running. This is
|
// NOTE: we pass false here so we do NOT attempt Thread.interrupt if EngineRefresher.run is currently running. This is
|
||||||
// very important, because doing so can cause files to suddenly be closed if they were doing IO when the interrupt
|
// very important, because doing so can cause files to suddenly be closed if they were doing IO when the interrupt
|
||||||
// hit. See https://issues.apache.org/jira/browse/LUCENE-2239
|
// hit. See https://issues.apache.org/jira/browse/LUCENE-2239
|
||||||
refreshScheduledFuture.cancel(false);
|
FutureUtils.cancel(refreshScheduledFuture);
|
||||||
refreshScheduledFuture = null;
|
refreshScheduledFuture = null;
|
||||||
}
|
}
|
||||||
InternalIndexShard.this.refreshInterval = refreshInterval;
|
InternalIndexShard.this.refreshInterval = refreshInterval;
|
||||||
|
|
|
@ -24,6 +24,7 @@ import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.ByteSizeUnit;
|
import org.elasticsearch.common.unit.ByteSizeUnit;
|
||||||
import org.elasticsearch.common.unit.ByteSizeValue;
|
import org.elasticsearch.common.unit.ByteSizeValue;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.index.engine.Engine;
|
import org.elasticsearch.index.engine.Engine;
|
||||||
import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
|
import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
|
||||||
import org.elasticsearch.index.settings.IndexSettings;
|
import org.elasticsearch.index.settings.IndexSettings;
|
||||||
|
@ -94,7 +95,7 @@ public class TranslogService extends AbstractIndexShardComponent {
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
indexSettingsService.removeListener(applySettings);
|
indexSettingsService.removeListener(applySettings);
|
||||||
this.future.cancel(true);
|
FutureUtils.cancel(this.future);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@ import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.ByteSizeUnit;
|
import org.elasticsearch.common.unit.ByteSizeUnit;
|
||||||
import org.elasticsearch.common.unit.ByteSizeValue;
|
import org.elasticsearch.common.unit.ByteSizeValue;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.index.engine.Engine;
|
import org.elasticsearch.index.engine.Engine;
|
||||||
import org.elasticsearch.index.engine.EngineClosedException;
|
import org.elasticsearch.index.engine.EngineClosedException;
|
||||||
import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
|
import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
|
||||||
|
@ -131,10 +132,8 @@ public class IndexingMemoryController extends AbstractLifecycleComponent<Indexin
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doStop() throws ElasticsearchException {
|
protected void doStop() throws ElasticsearchException {
|
||||||
if (scheduler != null) {
|
FutureUtils.cancel(scheduler);
|
||||||
scheduler.cancel(false);
|
scheduler = null;
|
||||||
scheduler = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -20,13 +20,13 @@
|
||||||
package org.elasticsearch.monitor.jvm;
|
package org.elasticsearch.monitor.jvm;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.collect.ImmutableSet;
|
|
||||||
import org.elasticsearch.ElasticsearchException;
|
import org.elasticsearch.ElasticsearchException;
|
||||||
import org.elasticsearch.common.collect.MapBuilder;
|
import org.elasticsearch.common.collect.MapBuilder;
|
||||||
import org.elasticsearch.common.component.AbstractLifecycleComponent;
|
import org.elasticsearch.common.component.AbstractLifecycleComponent;
|
||||||
import org.elasticsearch.common.inject.Inject;
|
import org.elasticsearch.common.inject.Inject;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
@ -35,7 +35,6 @@ import java.util.Set;
|
||||||
import java.util.concurrent.ScheduledFuture;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
|
|
||||||
import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
|
import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
|
||||||
import static org.elasticsearch.monitor.jvm.DeadlockAnalyzer.deadlockAnalyzer;
|
|
||||||
import static org.elasticsearch.monitor.jvm.JvmStats.GarbageCollector;
|
import static org.elasticsearch.monitor.jvm.JvmStats.GarbageCollector;
|
||||||
import static org.elasticsearch.monitor.jvm.JvmStats.jvmStats;
|
import static org.elasticsearch.monitor.jvm.JvmStats.jvmStats;
|
||||||
|
|
||||||
|
@ -124,7 +123,7 @@ public class JvmMonitorService extends AbstractLifecycleComponent<JvmMonitorServ
|
||||||
if (!enabled) {
|
if (!enabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
scheduledFuture.cancel(true);
|
FutureUtils.cancel(scheduledFuture);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -47,6 +47,7 @@ import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.util.BigArrays;
|
import org.elasticsearch.common.util.BigArrays;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
|
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
import org.elasticsearch.common.xcontent.XContentHelper;
|
import org.elasticsearch.common.xcontent.XContentHelper;
|
||||||
import org.elasticsearch.common.xcontent.XContentParser;
|
import org.elasticsearch.common.xcontent.XContentParser;
|
||||||
|
@ -185,7 +186,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doClose() throws ElasticsearchException {
|
protected void doClose() throws ElasticsearchException {
|
||||||
keepAliveReaper.cancel(false);
|
FutureUtils.cancel(keepAliveReaper);
|
||||||
}
|
}
|
||||||
|
|
||||||
public DfsSearchResult executeDfsPhase(ShardSearchRequest request) throws ElasticsearchException {
|
public DfsSearchResult executeDfsPhase(ShardSearchRequest request) throws ElasticsearchException {
|
||||||
|
|
|
@ -34,6 +34,7 @@ import org.elasticsearch.common.transport.TransportAddress;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
|
||||||
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
|
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
|
||||||
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
|
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -213,8 +214,8 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
|
||||||
// or because we failed serializing the message
|
// or because we failed serializing the message
|
||||||
final RequestHolder holderToNotify = clientHandlers.remove(requestId);
|
final RequestHolder holderToNotify = clientHandlers.remove(requestId);
|
||||||
// if the scheduler raise a EsRejectedExecutionException (due to shutdown), we may have a timeout handler, but no future
|
// if the scheduler raise a EsRejectedExecutionException (due to shutdown), we may have a timeout handler, but no future
|
||||||
if (timeoutHandler != null && timeoutHandler.future != null) {
|
if (timeoutHandler != null) {
|
||||||
timeoutHandler.future.cancel(false);
|
FutureUtils.cancel(timeoutHandler.future);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If holderToNotify == null then handler has already been taken care of.
|
// If holderToNotify == null then handler has already been taken care of.
|
||||||
|
@ -444,7 +445,7 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
|
||||||
|
|
||||||
public void cancel() {
|
public void cancel() {
|
||||||
if (timeout != null) {
|
if (timeout != null) {
|
||||||
timeout.future.cancel(false);
|
FutureUtils.cancel(timeout.future);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@ import org.elasticsearch.common.component.AbstractLifecycleComponent;
|
||||||
import org.elasticsearch.common.inject.Inject;
|
import org.elasticsearch.common.inject.Inject;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
|
import org.elasticsearch.common.util.concurrent.FutureUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -104,9 +105,9 @@ public class ResourceWatcherService extends AbstractLifecycleComponent<ResourceW
|
||||||
if (!enabled) {
|
if (!enabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
lowFuture.cancel(true);
|
FutureUtils.cancel(lowFuture);
|
||||||
mediumFuture.cancel(true);
|
FutureUtils.cancel(mediumFuture);
|
||||||
highFuture.cancel(true);
|
FutureUtils.cancel(highFuture);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue