Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ThreadPoolExecutor instead of EventLoop #8208

Merged
merged 5 commits into from
Oct 14, 2020
Merged

Use ThreadPoolExecutor instead of EventLoop #8208

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3bf030
use ThreadPoolExecutor
315157973 Oct 6, 2020
8612e46
add shutdown
315157973 Oct 6, 2020
b19536b
use ExecutorProvider instead
315157973 Oct 7, 2020
64daa07
Update pulsar-client/src/main/java/org/apache/pulsar/client/impl/Puls…
315157973 Oct 11, 2020
96799c6
merge master
315157973 Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,7 @@ private void receiveMessageFromConsumer(ConsumerImpl<T> consumer) {
} else {
// Schedule next receiveAsync() if the incoming queue is not full. Use a different thread to avoid
// recursion and stack overflow
client.eventLoopGroup().execute(() -> {
receiveMessageFromConsumer(consumer);
});
client.getInternalExecutorService().execute(() -> receiveMessageFromConsumer(consumer));
}
} finally {
lock.writeLock().unlock();
Expand Down Expand Up @@ -314,7 +312,7 @@ private void resumeReceivingFromPausedConsumersIfNeeded() {
}

// if messages are readily available on consumer we will attempt to writeLock on the same thread
client.eventLoopGroup().execute(() -> {
client.getInternalExecutorService().execute(() -> {
receiveMessageFromConsumer(consumer);
});
}
Expand Down
9 changes: 8 additions & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/PulsarClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
Expand All @@ -65,7 +67,6 @@
import org.apache.pulsar.client.api.schema.SchemaInfoProvider;
import org.apache.pulsar.client.api.AuthenticationFactory;
import org.apache.pulsar.client.api.transaction.TransactionBuilder;
import org.apache.pulsar.client.api.transaction.TransactionCoordinatorClientException;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
Expand Down Expand Up @@ -96,6 +97,7 @@ public class PulsarClientImpl implements PulsarClient {
private final ConnectionPool cnxPool;
private final Timer timer;
private final ExecutorProvider externalExecutorProvider;
private final ExecutorProvider internalExecutorService;

public enum State {
Open, Closing, Closed
Expand Down Expand Up @@ -145,6 +147,7 @@ public PulsarClientImpl(ClientConfigurationData conf, EventLoopGroup eventLoopGr
conf.getAuthentication().start();
this.cnxPool = cnxPool;
externalExecutorProvider = new ExecutorProvider(conf.getNumListenerThreads(), getThreadFactory("pulsar-external-listener"));
internalExecutorService = new ExecutorProvider(conf.getNumIoThreads(), getThreadFactory("pulsar-client-io"));
315157973 marked this conversation as resolved.
Show resolved Hide resolved
if (conf.getServiceUrl().startsWith("http")) {
lookup = new HttpLookupService(conf, eventLoopGroup);
} else {
Expand Down Expand Up @@ -591,6 +594,7 @@ public void shutdown() throws PulsarClientException {
cnxPool.close();
timer.stop();
externalExecutorProvider.shutdownNow();
internalExecutorService.shutdownNow();
conf.getAuthentication().close();
} catch (Throwable t) {
log.warn("Failed to shutdown Pulsar client", t);
Expand Down Expand Up @@ -815,6 +819,9 @@ protected <T> CompletableFuture<Schema<T>> preProcessSchemaBeforeSubscribe(Pulsa
return CompletableFuture.completedFuture(schema);
}

public ExecutorService getInternalExecutorService() {
return internalExecutorService.getExecutor();
}
//
// Transaction related API
//
Expand Down