Propogate rejected execution during bulk actions (#64886)
Currently a rejected execution exception can be swallowed when async actions return during transport bulk actions. This includes scenarios where we went async to perform ingest pipelines or index creation. This commit resolves the issue by propagating a rejected exception.
This commit is contained in:
parent
aa0e3f85e6
commit
f96dccd1ec
|
@ -58,7 +58,6 @@ import org.elasticsearch.cluster.service.ClusterService;
|
|||
import org.elasticsearch.common.inject.Inject;
|
||||
import org.elasticsearch.common.lease.Releasable;
|
||||
import org.elasticsearch.common.unit.TimeValue;
|
||||
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
|
||||
import org.elasticsearch.common.util.concurrent.AtomicArray;
|
||||
import org.elasticsearch.index.Index;
|
||||
import org.elasticsearch.index.IndexNotFoundException;
|
||||
|
@ -271,8 +270,13 @@ public class TransportBulkAction extends HandledTransportAction<BulkRequest, Bul
|
|||
@Override
|
||||
public void onResponse(CreateIndexResponse result) {
|
||||
if (counter.decrementAndGet() == 0) {
|
||||
threadPool.executor(executorName).execute(
|
||||
() -> executeBulk(task, bulkRequest, startTime, listener, responses, indicesThatCannotBeCreated));
|
||||
threadPool.executor(executorName).execute(new ActionRunnable<BulkResponse>(listener) {
|
||||
|
||||
@Override
|
||||
protected void doRun() {
|
||||
executeBulk(task, bulkRequest, startTime, listener, responses, indicesThatCannotBeCreated);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -288,11 +292,22 @@ public class TransportBulkAction extends HandledTransportAction<BulkRequest, Bul
|
|||
}
|
||||
}
|
||||
if (counter.decrementAndGet() == 0) {
|
||||
threadPool.executor(executorName).execute(() -> executeBulk(task, bulkRequest, startTime,
|
||||
ActionListener.wrap(listener::onResponse, inner -> {
|
||||
final ActionListener<BulkResponse> wrappedListener = ActionListener.wrap(listener::onResponse, inner -> {
|
||||
inner.addSuppressed(e);
|
||||
listener.onFailure(inner);
|
||||
}), responses, indicesThatCannotBeCreated));
|
||||
});
|
||||
threadPool.executor(executorName).execute(new ActionRunnable<BulkResponse>(wrappedListener) {
|
||||
@Override
|
||||
protected void doRun() {
|
||||
executeBulk(task, bulkRequest, startTime, wrappedListener, responses, indicesThatCannotBeCreated);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRejection(Exception rejectedException) {
|
||||
rejectedException.addSuppressed(e);
|
||||
super.onRejection(rejectedException);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -731,14 +746,9 @@ public class TransportBulkAction extends HandledTransportAction<BulkRequest, Bul
|
|||
assert Thread.currentThread().getName().contains(executorName);
|
||||
doInternalExecute(task, bulkRequest, executorName, actionListener);
|
||||
} else {
|
||||
threadPool.executor(executorName).execute(new AbstractRunnable() {
|
||||
threadPool.executor(executorName).execute(new ActionRunnable<BulkResponse>(listener) {
|
||||
@Override
|
||||
public void onFailure(Exception e) {
|
||||
listener.onFailure(e);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doRun() throws Exception {
|
||||
protected void doRun() {
|
||||
doInternalExecute(task, bulkRequest, executorName, actionListener);
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.bulk;
|
||||
|
||||
import org.elasticsearch.ResourceAlreadyExistsException;
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.DocWriteRequest;
|
||||
|
@ -42,6 +43,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodeRole;
|
|||
import org.elasticsearch.cluster.service.ClusterService;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.unit.TimeValue;
|
||||
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
|
||||
import org.elasticsearch.index.IndexNotFoundException;
|
||||
import org.elasticsearch.index.IndexingPressure;
|
||||
import org.elasticsearch.index.VersionType;
|
||||
|
@ -77,12 +79,13 @@ public class TransportBulkActionTests extends ESTestCase {
|
|||
/** Services needed by bulk action */
|
||||
private TransportService transportService;
|
||||
private ClusterService clusterService;
|
||||
private ThreadPool threadPool;
|
||||
private TestThreadPool threadPool;
|
||||
|
||||
private TestTransportBulkAction bulkAction;
|
||||
|
||||
class TestTransportBulkAction extends TransportBulkAction {
|
||||
|
||||
volatile boolean failIndexCreation = false;
|
||||
boolean indexCreated = false; // set when the "real" index is created
|
||||
|
||||
TestTransportBulkAction() {
|
||||
|
@ -100,9 +103,13 @@ public class TransportBulkActionTests extends ESTestCase {
|
|||
@Override
|
||||
void createIndex(String index, TimeValue timeout, Version minNodeVersion, ActionListener<CreateIndexResponse> listener) {
|
||||
indexCreated = true;
|
||||
if (failIndexCreation) {
|
||||
listener.onFailure(new ResourceAlreadyExistsException("index already exists"));
|
||||
} else {
|
||||
listener.onResponse(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
|
@ -293,6 +300,20 @@ public class TransportBulkActionTests extends ESTestCase {
|
|||
assertTrue(bulkAction.includesSystem(buildBulkRequest(mixed), indicesLookup, systemIndices));
|
||||
}
|
||||
|
||||
public void testRejectionAfterCreateIndexIsPropagated() throws Exception {
|
||||
BulkRequest bulkRequest = new BulkRequest().add(new IndexRequest("index").id("id").source(Collections.emptyMap()));
|
||||
bulkAction.failIndexCreation = randomBoolean();
|
||||
|
||||
try {
|
||||
threadPool.startForcingRejections();
|
||||
PlainActionFuture<BulkResponse> future = PlainActionFuture.newFuture();
|
||||
ActionTestUtils.execute(bulkAction, null, bulkRequest, future);
|
||||
expectThrows(EsRejectedExecutionException.class, future::actionGet);
|
||||
} finally {
|
||||
threadPool.stopForcingRejections();
|
||||
}
|
||||
}
|
||||
|
||||
private BulkRequest buildBulkRequest(List<String> indices) {
|
||||
BulkRequest request = new BulkRequest();
|
||||
for (String index : indices) {
|
||||
|
|
|
@ -20,10 +20,20 @@
|
|||
package org.elasticsearch.threadpool;
|
||||
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.util.concurrent.EsExecutors;
|
||||
import org.elasticsearch.node.Node;
|
||||
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
|
||||
public class TestThreadPool extends ThreadPool {
|
||||
|
||||
private final CountDownLatch blockingLatch = new CountDownLatch(1);
|
||||
private volatile boolean returnRejectingExecutor = false;
|
||||
private volatile ThreadPoolExecutor rejectingExecutor;
|
||||
|
||||
public TestThreadPool(String name, ExecutorBuilder<?>... customBuilders) {
|
||||
this(name, Settings.EMPTY, customBuilders);
|
||||
}
|
||||
|
@ -32,4 +42,64 @@ public class TestThreadPool extends ThreadPool {
|
|||
super(Settings.builder().put(Node.NODE_NAME_SETTING.getKey(), name).put(settings).build(), customBuilders);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExecutorService executor(String name) {
|
||||
if (returnRejectingExecutor) {
|
||||
return rejectingExecutor;
|
||||
} else {
|
||||
return super.executor(name);
|
||||
}
|
||||
}
|
||||
|
||||
public void startForcingRejections() {
|
||||
if (rejectingExecutor == null) {
|
||||
createRejectingExecutor();
|
||||
}
|
||||
returnRejectingExecutor = true;
|
||||
}
|
||||
|
||||
public void stopForcingRejections() {
|
||||
returnRejectingExecutor = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdown() {
|
||||
blockingLatch.countDown();
|
||||
if (rejectingExecutor != null) {
|
||||
rejectingExecutor.shutdown();
|
||||
}
|
||||
super.shutdown();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void shutdownNow() {
|
||||
blockingLatch.countDown();
|
||||
if (rejectingExecutor != null) {
|
||||
rejectingExecutor.shutdownNow();
|
||||
}
|
||||
super.shutdownNow();
|
||||
}
|
||||
|
||||
private synchronized void createRejectingExecutor() {
|
||||
if (rejectingExecutor != null) {
|
||||
return;
|
||||
}
|
||||
ThreadFactory factory = EsExecutors.daemonThreadFactory("reject_thread");
|
||||
rejectingExecutor = EsExecutors.newFixed("rejecting", 1, 0, factory, getThreadContext());
|
||||
|
||||
CountDownLatch startedLatch = new CountDownLatch(1);
|
||||
rejectingExecutor.execute(() -> {
|
||||
try {
|
||||
startedLatch.countDown();
|
||||
blockingLatch.await();
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
try {
|
||||
startedLatch.await();
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue