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

Jump to bottom

Do a delayed check before decoding the delivery and make sure to handle RejectedExecutionException #27839

Merged
merged 2 commits into from
Mar 31, 2022
Merged

Do a delayed check before decoding the delivery and make sure to handle RejectedExecutionException #27839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
795b1ac
Avoid error in one faulty receiver bypassing to parent connection hos…
anuchandy Mar 23, 2022
bd031e8
sync upstream
anuchandy Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ com.azure.tools:azure-sdk-build-tool;1.0.0-beta.1;1.0.0-beta.2
unreleased_com.azure:azure-aot-graalvm-support;1.0.0-beta.1
unreleased_com.azure:azure-aot-graalvm-support-netty;1.0.0-beta.1
unreleased_com.azure:azure-aot-graalvm-perf;1.0.0-beta.1
unreleased_com.azure:azure-core-amqp;2.5.0-beta.1
anuchandy marked this conversation as resolved.
Show resolved Hide resolved
unreleased_com.azure:azure-core;1.27.0-beta.1

# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
Expand Down
5 changes: 5 additions & 0 deletions ...ore/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ReactorReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ protected ReactorReceiver(AmqpConnection amqpConnection, String entityPath, Rece
return Mono.create(sink -> {
try {
this.dispatcher.invoke(() -> {
if (isDisposed()) {
sink.error(new IllegalStateException(
"Cannot decode delivery when ReactorReceiver instance is closed."));
return;
}
final Message message = decodeDelivery(delivery);
final int creditsLeft = receiver.getRemoteCredit();

Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhubs/azure-messaging-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.4.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.5.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core-amqp;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand Down
18 changes: 14 additions & 4 deletions .../src/main/java/com/azure/messaging/eventhubs/implementation/AmqpReceiveLinkProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,20 @@ public void onNext(AmqpReceiveLink next) {
}),
next.receive()
.onBackpressureBuffer(maxQueueSize, BufferOverflowStrategy.ERROR)
.subscribe(message -> {
messageQueue.add(message);
drain();
}));
.subscribe(
message -> {
messageQueue.add(message);
drain();
},
error -> {
// When the receive on AmqpReceiveLink (e.g., ReactorReceiver) terminates
// with an error, we expect the recovery to happen in response to the terminal events
// in link EndpointState Flux.
logger.atVerbose()
.addKeyValue(LINK_NAME_KEY, linkName)
.addKeyValue(ENTITY_PATH_KEY, entityPath)
.log("Receiver is terminated.", error);
}));
}

disposeReceiver(oldChannel);
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/azure-messaging-servicebus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.4.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
<version>2.5.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core-amqp;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
5 changes: 3 additions & 2 deletions ...rc/main/java/com/azure/messaging/servicebus/implementation/ServiceBusReactorReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.util.StringJoiner;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

Expand Down Expand Up @@ -265,7 +266,7 @@ private Mono<Void> updateDispositionInternal(String lockToken, DeliveryState del
unsettled.disposition(deliveryState);
pendingUpdates.put(lockToken, workItem);
});
} catch (IOException error) {
} catch (IOException | RejectedExecutionException error) {
sink.error(new AmqpException(false, "updateDisposition failed while dispatching to Reactor.",
error, handler.getErrorContext(receiver)));
}
Expand Down Expand Up @@ -348,7 +349,7 @@ private void updateOutcome(String lockToken, Delivery delivery) {
workItem.resetStartTime();
try {
provider.getReactorDispatcher().invoke(() -> delivery.disposition(workItem.getDeliveryState()));
} catch (IOException error) {
} catch (IOException | RejectedExecutionException error) {
final Throwable amqpException = logger.atError()
.addKeyValue(LOCK_TOKEN_KEY, lockToken)
.log(new AmqpException(false,
Expand Down
24 changes: 17 additions & 7 deletions ...in/java/com/azure/messaging/servicebus/implementation/ServiceBusReceiveLinkProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,24 @@ public void onNext(ServiceBusReceiveLink next) {
next.setEmptyCreditListener(() -> 0);

currentLinkSubscriptions = Disposables.composite(
next.receive().publishOn(Schedulers.boundedElastic()).subscribe(message -> {
synchronized (queueLock) {
messageQueue.add(message);
pendingMessages.incrementAndGet();
}
next.receive().publishOn(Schedulers.boundedElastic()).subscribe(
message -> {
synchronized (queueLock) {
messageQueue.add(message);
pendingMessages.incrementAndGet();
}

drain();
}),
drain();
},
error -> {
// When the receive on AmqpReceiveLink (e.g., ServiceBusReactorReceiver) terminates
// with an error, we expect the recovery to happen in response to the terminal events
// in link EndpointState Flux.
logger.atVerbose()
.addKeyValue(LINK_NAME_KEY, linkName)
.addKeyValue(ENTITY_PATH_KEY, entityPath)
.log("Receiver is terminated.", error);
}),
next.getEndpointStates().subscribeOn(Schedulers.boundedElastic()).subscribe(
state -> {
// Connection was successfully opened, we can reset the retry interval.
Expand Down