core,netty: fix a race for channelz at server transport creation

grpc · Jan 15, 2020 · 98b11bd · 98b11bd
1 parent 1b5d61f
commit 98b11bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -439,7 +439,9 @@ class TransportShutdownNow implements Runnable {
           @Override public void run() {}
         }, null);
       }
-      channelz.addServerSocket(ServerImpl.this, transport);
+      synchronized (lock) {
+        channelz.addServerSocket(ServerImpl.this, transport);
+      }
     }
 
     @Override

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