netty: fix a race for channelz at server transport creation

grpc · Jan 15, 2020 · a4077bf · a4077bf
1 parent 1b5d61f
commit a4077bf
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java
@@ -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);
+    listenSocketStats.set(listenSocket);
+    channelz.addListenSocket(listenSocket);
   }
 
   @Override