diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java index 1537f8794994f..3956e04ba0aab 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4TcpChannel.java @@ -20,7 +20,6 @@ import org.elasticsearch.core.IOUtils; import org.elasticsearch.core.Releasables; import org.elasticsearch.transport.TcpChannel; -import org.elasticsearch.transport.TransportException; import java.net.InetSocketAddress; @@ -163,10 +162,6 @@ public InetSocketAddress getRemoteAddress() { @Override public void sendMessage(BytesReference reference, ActionListener listener) { channel.writeAndFlush(Netty4Utils.toByteBuf(reference), addPromise(listener, channel)); - - if (channel.eventLoop().isShutdown()) { - listener.onFailure(new TransportException("Cannot send message, event loop is shutting down.")); - } } public Channel getNettyChannel() { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java index 3d4340c012403..b3dff10127073 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java @@ -671,7 +671,6 @@ public void testScrollRewrittenToMatchNoDocs() { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/95759") public void testRestartDataNodesDuringScrollSearch() throws Exception { final String dataNode = internalCluster().startDataOnlyNode(); createIndex("demo", indexSettings(1, 0).put("index.routing.allocation.include._name", dataNode).build());