Skip to content

Fix issue where pages aren't released #27459

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 2 commits into from
Nov 20, 2017
Merged

Fix issue where pages aren't released #27459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0189c2
Fix issue where pages aren't released
Tim-Brooks Nov 20, 2017
0ff8cf7
Clean up
Tim-Brooks Nov 20, 2017
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
13 changes: 11 additions & 2 deletions ...es/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelOption;
import io.netty.channel.ChannelPromise;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.transport.TcpChannel;
import org.elasticsearch.transport.TransportException;

import java.net.InetSocketAddress;
import java.nio.channels.ClosedSelectorException;
import java.util.concurrent.CompletableFuture;

public class NettyTcpChannel implements TcpChannel {
Expand Down Expand Up @@ -80,8 +84,8 @@ public InetSocketAddress getLocalAddress() {

@Override
public void sendMessage(BytesReference reference, ActionListener<Void> listener) {
final ChannelFuture future = channel.writeAndFlush(Netty4Utils.toByteBuf(reference));
future.addListener(f -> {
ChannelPromise writePromise = channel.newPromise();
writePromise.addListener(f -> {
if (f.isSuccess()) {
listener.onResponse(null);
} else {
Expand All @@ -91,6 +95,11 @@ public void sendMessage(BytesReference reference, ActionListener<Void> listener)
listener.onFailure((Exception) cause);
}
});
channel.writeAndFlush(Netty4Utils.toByteBuf(reference), writePromise);

if (channel.eventLoop().isShutdown()) {
Copy link
Contributor

@s1monw s1monw Nov 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we protect this from double invocation? I think we should just make sure we only invoke once. can you wrap it in here and ensure that? maybe just use NotifyOnceListener

Copy link
Contributor Author

@Tim-Brooks Tim-Brooks Nov 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well - the only place we call this is from internalSendMessage.

    private void internalSendMessage(TcpChannel channel, BytesReference message, SendMetricListener listener) {
        try {
            channel.sendMessage(message, listener);
        } catch (Exception ex) {
            // call listener to ensure that any resources are released
            listener.onFailure(ex);
            onException(channel, ex);
        }
    }

And SendMetricListener is a NotifyOnceListener. So incidentally - yes it is always a notify once listener. Do you want me to codify that by changing the signature of TcpChannel#sendMessage to:

/**
     * Sends a tcp message to the channel. The listener will be executed once the send process has been
     * completed.
     *
     * @param reference to send to channel
     * @param listener to execute upon send completion
     */
    void sendMessage(BytesReference reference, NotifyOnceListener<Void> listener);

???

Copy link
Contributor Author

@Tim-Brooks Tim-Brooks Nov 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@s1monw

Copy link
Contributor

@s1monw s1monw Nov 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's find in this case! LGTM

listener.onFailure(new TransportException("Cannot send message, event loop is shutting down."));
}
}

public Channel getLowLevelChannel() {
Expand Down