Skip to content

[9.1] Describe closing channel in exception message (#133632) #134010

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

Merged
merged 1 commit into from
Sep 2, 2025
Merged

[9.1] Describe closing channel in exception message (#133632) #134010

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
12 changes: 11 additions & 1 deletion ...4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/ESLoggingHandlerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
package org.elasticsearch.transport.netty4;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.elasticsearch.ESNetty4IntegTestCase;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.MockLog;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.transport.NodeDisconnectedException;
import org.elasticsearch.transport.TcpTransport;
import org.elasticsearch.transport.TransportLogger;

Expand Down Expand Up @@ -117,7 +119,15 @@ public void testExceptionalDisconnectLogging() throws Exception {
TcpTransport.class.getCanonicalName(),
Level.DEBUG,
".*closed transport connection \\[[1-9][0-9]*\\] to .* with age \\[[0-9]+ms\\], exception:.*"
)
) {
@Override
public void match(LogEvent event) {
if (event.getThrown() instanceof NodeDisconnectedException nodeDisconnectedException
&& nodeDisconnectedException.getMessage().contains("closed exceptionally: Netty4TcpChannel{")) {
super.match(event);
}
}
}
);

final String nodeName = internalCluster().startNode();
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/transport/TcpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,15 +1134,15 @@ public void onResponse(Void v) {
nodeChannels.channels.forEach(ch -> {
// Mark the channel init time
ch.getChannelStats().markAccessed(relativeMillisTime);
ch.addCloseListener(new ActionListener<Void>() {
ch.addCloseListener(new ActionListener<>() {
@Override
public void onResponse(Void ignored) {
nodeChannels.close();
}

@Override
public void onFailure(Exception e) {
nodeChannels.closeAndFail(e);
nodeChannels.closeAndFail(new NodeDisconnectedException(node, "closed exceptionally: " + ch, null, e));
}
});
});
Expand Down