Skip to content

Remove pending acquirePromise once chained responseFuture fails #1115

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

Open
edwardxia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove pending acquirePromise once chained responseFuture fails #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions pushy/src/main/java/com/eatthepath/pushy/apns/ApnsChannelPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,14 @@ private void acquireWithinEventExecutor(final Promise<Channel> acquirePromise) {
this.acquireWithinEventExecutor(acquirePromise);
}
} else {
// If the deferred acquirePromise is cancelled, remove it from pendingAcquisitionPromises
// to allow garbage collection.
acquirePromise.addListener(future -> {
if (future.isCancelled()) {
pendingAcquisitionPromises.remove(acquirePromise);
}
});

// We don't have any connections ready to go, and don't have any more capacity to create new
// channels. Add this acquisition to the queue waiting for channels to become available.
pendingAcquisitionPromises.add(acquirePromise);
Expand Down
9 changes: 8 additions & 1 deletion pushy/src/main/java/com/eatthepath/pushy/apns/ApnsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public <T extends ApnsPushNotification> PushNotificationFuture<T, PushNotificati
if (!this.isClosed.get()) {
final long start = System.nanoTime();

this.channelPool.acquire().addListener((GenericFutureListener<Future<Channel>>) acquireFuture -> {
Future<Channel> acquirePromise = this.channelPool.acquire();
acquirePromise.addListener((GenericFutureListener<Future<Channel>>) acquireFuture -> {
if (acquireFuture.isSuccess()) {
final Channel channel = acquireFuture.getNow();

Expand All @@ -207,6 +208,12 @@ public <T extends ApnsPushNotification> PushNotificationFuture<T, PushNotificati
ApnsClient.this.metricsListener.handleNotificationAcknowledged(response, end - start);
} else {
ApnsClient.this.metricsListener.handleWriteFailure(notification.getTopic());

// Try cancel acquirePromise if responseFuture fails (e.g. TimeoutException)
// before acquirePromise gets resolved.
if (acquirePromise.isCancellable()) {
acquirePromise.cancel(true);
}
}
});
} else {
Expand Down