honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop action future that forks on listener executor (#53261) 

This commit drops the dispatching listenable action future that forks to
the listener thread pool. This was previously used in the transport
client but is no longer used.
This commit is contained in:
Jason Tedor 2020-03-08 12:34:59 -04:00
parent a0b235888f
commit 79b67eb3ba
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java
View File

@ -19,11 +19,8 @@
package org.elasticsearch.action.support; package org.elasticsearch.action.support;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ListenableActionFuture; import org.elasticsearch.action.ListenableActionFuture;
import org.elasticsearch.threadpool.ThreadPool;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -46,17 +43,6 @@ public class PlainListenableActionFuture<T> extends AdapterActionFuture<T, T> im
return new PlainListenableActionFuture<>(); return new PlainListenableActionFuture<>();
} }
/**
* This method returns a listenable future. The listeners will be called on completion of the future.
* The listeners will be executed on the LISTENER thread pool.
* @param threadPool the thread pool used to execute listeners
* @param <T> the result of the future
* @return a listenable future
*/
public static <T> PlainListenableActionFuture<T> newDispatchingListenableFuture(ThreadPool threadPool) {
return new DispatchingListenableActionFuture<>(threadPool);
}
@Override @Override
public void addListener(final ActionListener<T> listener) { public void addListener(final ActionListener<T> listener) {
internalAddListener(listener); internalAddListener(listener);
@ -121,18 +107,4 @@ public class PlainListenableActionFuture<T> extends AdapterActionFuture<T, T> im
} }
} }
private static final class DispatchingListenableActionFuture<T> extends PlainListenableActionFuture<T> {
private static final Logger logger = LogManager.getLogger(DispatchingListenableActionFuture.class);
private final ThreadPool threadPool;
private DispatchingListenableActionFuture(ThreadPool threadPool) {
this.threadPool = threadPool;
}
@Override
public void addListener(final ActionListener<T> listener) {
super.addListener(new ThreadedActionListener<>(logger, threadPool, ThreadPool.Names.LISTENER, listener, false));
}
}
} }

7
server/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java
View File

@ -34,12 +34,7 @@ public class ListenableActionFutureTests extends ESTestCase {
public void testListenerIsCallableFromNetworkThreads() throws Throwable { public void testListenerIsCallableFromNetworkThreads() throws Throwable {
ThreadPool threadPool = new TestThreadPool("testListenerIsCallableFromNetworkThreads"); ThreadPool threadPool = new TestThreadPool("testListenerIsCallableFromNetworkThreads");
try { try {
final PlainListenableActionFuture<Object> future; final PlainListenableActionFuture<Object> future = PlainListenableActionFuture.newListenableFuture();
if (randomBoolean()) {
future = PlainListenableActionFuture.newDispatchingListenableFuture(threadPool);
} else {
future = PlainListenableActionFuture.newListenableFuture();
}
final CountDownLatch listenerCalled = new CountDownLatch(1); final CountDownLatch listenerCalled = new CountDownLatch(1);
final AtomicReference<Throwable> error = new AtomicReference<>(); final AtomicReference<Throwable> error = new AtomicReference<>();
final Object response = new Object(); final Object response = new Object();