Skip to content

[fix][client][txn] Fix client connection closed before using #22749

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[fix][client][txn] Fix client connection closed before using #22749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c96bfc
Fix ClientCnx channel inactive exception
dao-jun May 19, 2024
3dd4425
Fix ClientCnx channel inactive exception
dao-jun May 20, 2024
b5a5610
Fix ClientCnx channel inactive exception
dao-jun May 20, 2024
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
15 changes: 10 additions & 5 deletions ...n/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionBufferHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,17 @@ public void endTxn(OpRequestSend op) {
}
} else {
Throwable cause = FutureUtil.unwrapCompletionException(ex);
log.error("endTxn error topic: [{}]", op.topic, cause);
if (cause instanceof PulsarClientException.BrokerMetadataException) {
op.cb.complete(null);
if (cause instanceof PulsarClientException.ConnectFailedException) {
log.warn("Client connection already closed, topic: [{}]", op.topic);
op.cb.completeExceptionally(cause);
} else {
op.cb.completeExceptionally(
new PulsarClientException.LookupException(cause.getMessage()));
log.error("endTxn error topic: [{}]", op.topic, cause);
if (cause instanceof PulsarClientException.BrokerMetadataException) {
op.cb.complete(null);
} else {
op.cb.completeExceptionally(
new PulsarClientException.LookupException(cause.getMessage()));
}
}
onResponse(op);
}
Expand Down
11 changes: 11 additions & 0 deletions pulsar-client-api/src/main/java/org/apache/pulsar/client/api/PulsarClientException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,15 @@ public InvalidServiceURL(String msg, Throwable t) {
}
}

/**
* Clients are unable to connect to the broker.
*/
public static class ConnectFailedException extends PulsarClientException {
public ConnectFailedException(String msg) {
super(msg);
}
}

/**
* Invalid Configuration exception thrown by Pulsar client.
*/
Expand Down Expand Up @@ -1127,6 +1136,8 @@ public static PulsarClientException unwrap(Throwable t) {
newException = new NotFoundException(msg);
} else if (cause instanceof TransactionHasOperationFailedException) {
newException = new TransactionHasOperationFailedException(msg);
} else if (cause instanceof ConnectFailedException) {
newException = new ConnectFailedException(msg);
} else {
newException = new PulsarClientException(t);
}
Expand Down
3 changes: 2 additions & 1 deletion pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
lastDisconnectedTimestamp = System.currentTimeMillis();
log.info("{} Disconnected", ctx.channel());
if (!connectionFuture.isDone()) {
connectionFuture.completeExceptionally(new PulsarClientException("Connection already closed"));
connectionFuture.completeExceptionally(
new PulsarClientException.ConnectFailedException("Connection already closed"));
}

ConnectException e = new ConnectException(
Expand Down
Loading