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

netty: fix a race for channelz at server transport creation #6610

Merged
merged 4 commits into from Jan 16, 2020
Merged

netty: fix a race for channelz at server transport creation #6610

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4077bf
netty: fix a race for channelz at server transport creation
dapengzhang0 Jan 15, 2020
dab9430
add SocketStats in event loop
dapengzhang0 Jan 16, 2020
f07f0c5
change comment
dapengzhang0 Jan 16, 2020
7259df3
Use fix eventLoop pool in test
dapengzhang0 Jan 16, 2020
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
17 changes: 4 additions & 13 deletions netty/src/main/java/io/grpc/netty/NettyServer.java
View file
Open in desktop
Expand Up @@ -251,19 +251,10 @@ public void operationComplete(ChannelFuture future) throws Exception {
throw new IOException("Failed to bind", future.cause());
}
channel = future.channel();
Future<?> channelzFuture = channel.eventLoop().submit(new Runnable() {
@Override
public void run() {
InternalInstrumented<SocketStats> listenSocket = new ListenSocket(channel);
listenSocketStats.set(listenSocket);
channelz.addListenSocket(listenSocket);
}
});
try {
channelzFuture.await();
} catch (InterruptedException ex) {
throw new RuntimeException("Interrupted while registering listen socket to channelz", ex);
}

InternalInstrumented<SocketStats> listenSocket = new ListenSocket(channel);
Copy link
Member

Choose a reason for hiding this comment

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

Make a comment here that this requires the channel to have completed bind()ing.

listenSocketStats.set(listenSocket);
channelz.addListenSocket(listenSocket);
}

@Override
Expand Down