[#133] feat(netty): Add StreamServer. #718

leixm · 2023-03-14T11:48:50Z

What changes were proposed in this pull request?

Add StreamServer for netty replace grpc.

Why are the changes needed?

Add StreamServer.

Does this PR introduce any user-facing change?

No.

How was this patch tested?

UT.

codecov-commenter · 2023-03-14T11:58:20Z

Codecov Report

Merging #718 (1a4fea1) into master (e38d799) will increase coverage by 2.32%.
The diff coverage is 70.79%.

@@             Coverage Diff              @@
##             master     #718      +/-   ##
============================================
+ Coverage     60.60%   62.92%   +2.32%     
- Complexity     1849     1860      +11     
============================================
  Files           229      217      -12     
  Lines         12749    10898    -1851     
  Branches       1064     1073       +9     
============================================
- Hits           7727     6858     -869     
+ Misses         4611     3686     -925     
+ Partials        411      354      -57

Impacted Files	Coverage Δ
.../server/netty/decoder/StreamServerInitDecoder.java	`0.00% <0.00%> (ø)`
.../org/apache/uniffle/server/netty/StreamServer.java	`62.50% <62.50%> (ø)`
.../java/org/apache/uniffle/server/ShuffleServer.java	`64.48% <71.42%> (+3.13%)`	⬆️
...a/org/apache/uniffle/server/ShuffleServerConf.java	`99.45% <100.00%> (+0.06%)`	⬆️

... and 14 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

jerqi · 2023-03-14T11:57:56Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

@@ -404,6 +404,48 @@ public class ShuffleServerConf extends RssBaseConf {
      .defaultValue(-1)
      .withDescription("Shuffle netty server port");

+  public static final ConfigOption<Boolean> NETTY_SERVER_ENABLED = ConfigOptions


We don't need this config option. If netty port is set, we should enable Netty server.

It's ok for me.

jerqi · 2023-03-14T11:58:23Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

+      .defaultValue(false)
+      .withDescription("If enable netty server");
+
+  public static final ConfigOption<Boolean> SERVER_UPLOAD_EPOLL_ENABLE = ConfigOptions


What's the meaning of upload?

Already Fixed.

jerqi · 2023-03-14T11:59:08Z

server/src/main/java/org/apache/uniffle/server/netty/decoder/StreamServerInitDecoder.java

+
+  private static final Logger logger = LoggerFactory.getLogger(StreamServerInitDecoder.class);
+
+  private ShuffleServer shuffleServer;


Why do we need ShuffleServer?

In fact, StreamServerInitDecoder needs ShuffleServer to obtain taskManager, etc. I will delete it in this PR, and add it to subsequent PRs.

jerqi · 2023-03-14T11:59:29Z

@smallzhongfeng Could you help me review this pr?

smallzhongfeng · 2023-03-14T12:33:42Z

server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java

+        ch.pipeline().addLast(handlerSupplier.get());
+      }
+    })
+               .option(ChannelOption.SO_BACKLOG, backlogSize)


Maybe we should add Option TCP_NODELAY, this parameter should be used to send packets this time. It does not need to use Nagle algorithm to reduce the delay time.

smallzhongfeng · 2023-03-14T12:34:57Z

server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java

+      channelFuture.channel().close().awaitUninterruptibly(10L, TimeUnit.SECONDS);
+      channelFuture = null;
+    }
+    shuffleBossGroup.shutdownGracefully();


ShuffleBossGroup determines whether it is empty ?

smallzhongfeng · 2023-03-14T12:35:33Z

server/src/main/java/org/apache/uniffle/server/netty/decoder/StreamServerInitDecoder.java

+
+    addDecoder(ctx, magicByte);
+  }
+


Remove this blank line.

leixm · 2023-03-14T13:41:20Z

@smallzhongfeng All done.

advancedxy · 2023-03-14T13:48:17Z

server/src/main/java/org/apache/uniffle/server/ShuffleServer.java

@@ -221,6 +230,10 @@ private void initialization() throws Exception {
    shuffleBufferManager = new ShuffleBufferManager(shuffleServerConf, shuffleFlushManager);
    shuffleTaskManager = new ShuffleTaskManager(shuffleServerConf, shuffleFlushManager,
        shuffleBufferManager, storageManager);
+    nettyServerEnabled = shuffleServerConf.get(ShuffleServerConf.NETTY_SERVER_PORT) > 0;


Maybe >= 0?

@jerqi could you also add port=0 for random port binding?

We set up an issue first.

advancedxy · 2023-03-14T13:50:09Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

+      .key("rss.server.netty.epoll.enable")
+      .booleanType()
+      .defaultValue(false)
+      .withDescription("If enable epoll model with netty server");


nit: whether to enable epoll mode with netty server?

Also, could you add more description about how epoll mode diffs with normal mode?

You can update the docs in the final PR?

EPOLL is more suitable for scenarios with a large number of connections, but we need more tests to verify the difference between nio and epoll in uniffle usage scenarios. It is difficult to give a suggestion at present, so the default value is nio.

It is difficult to give a suggestion at present, so the default value is nio.

That's OK. Let's add a todo in the final PR, which I think will includes a comprehensive docs.

advancedxy · 2023-03-14T13:50:34Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

+  public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_BACKLOG = ConfigOptions
+      .key("rss.server.netty.connect.backlog")
+      .intType()
+      .defaultValue(1000)


is 1000 enough?

advancedxy · 2023-03-14T13:51:16Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

+      .defaultValue(-1)
+      .withDescription("the optimal size for send buffer(SO_SNDBUF) "
+                           + "should be latency * network_bandwidth. Assuming latency = 1ms,"
+                           + "network_bandwidth = 10Gbps, buffer size should be ~ 1.25MB");


Add some desc about what the default value -1 means?

advancedxy · 2023-03-14T13:51:25Z

server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java

+      .key("rss.server.netty.receive.buf")
+      .intType()
+      .defaultValue(-1)
+      .withDescription("the optimal size for receive buffer(SO_RCVBUF) "


advancedxy · 2023-03-14T13:52:42Z

server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java

+    ServerBootstrap serverBootstrap = bossGroup instanceof EpollEventLoopGroup
+                                          ? new ServerBootstrap().group(bossGroup, workerGroup)
+                                                .channel(EpollServerSocketChannel.class)
+                                          : new ServerBootstrap().group(bossGroup, workerGroup)


nit: the indentation looks a bit weird..

server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java

smallzhongfeng

LGTM

leixm · 2023-03-15T02:36:45Z

@advancedxy All done.

leixm · 2023-03-15T02:37:15Z

@jerqi @advancedxy Can you help review plz?

jerqi

LGTM, thanks @advancedxy @leixm @smallzhongfeng merged.

### What changes were proposed in this pull request? Add StreamServer for netty replace grpc. ### Why are the changes needed? Add StreamServer. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? UT. Co-authored-by: leixianming <leixianming@didiglobal.com>

[apache#133][Netty] Add StreamServer.

1cb3cdd

jerqi changed the title ~~[#133][Netty] Add StreamServer.~~ [#133] feat(netty): Add StreamServer. Mar 14, 2023

jerqi reviewed Mar 14, 2023

View reviewed changes

leixianming added 2 commits March 14, 2023 20:12

Fix.

a6d54ea

Fix.

4f4e4a9

smallzhongfeng reviewed Mar 14, 2023

View reviewed changes

leixianming added 2 commits March 14, 2023 20:58

Fix.

4dc5cbb

Fix CheckStyle.

bde3c07

advancedxy reviewed Mar 14, 2023

View reviewed changes

Fix.

1a4fea1

smallzhongfeng approved these changes Mar 15, 2023

View reviewed changes

jerqi approved these changes Mar 15, 2023

View reviewed changes

jerqi merged commit 46f3f7e into apache:master Mar 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#133] feat(netty): Add StreamServer. #718

[#133] feat(netty): Add StreamServer. #718

leixm commented Mar 14, 2023

codecov-commenter commented Mar 14, 2023 •

edited

jerqi Mar 14, 2023

leixm Mar 14, 2023

jerqi Mar 14, 2023

leixm Mar 14, 2023

jerqi Mar 14, 2023

leixm Mar 14, 2023

jerqi commented Mar 14, 2023

smallzhongfeng Mar 14, 2023

smallzhongfeng Mar 14, 2023

smallzhongfeng Mar 14, 2023

leixm commented Mar 14, 2023

advancedxy Mar 14, 2023

jerqi Mar 14, 2023

advancedxy Mar 14, 2023

leixm Mar 14, 2023

advancedxy Mar 15, 2023

advancedxy Mar 14, 2023

advancedxy Mar 14, 2023

advancedxy Mar 14, 2023

advancedxy Mar 14, 2023

smallzhongfeng left a comment

leixm commented Mar 15, 2023

leixm commented Mar 15, 2023

jerqi left a comment •

edited


		private static final Logger logger = LoggerFactory.getLogger(StreamServerInitDecoder.class);

		private ShuffleServer shuffleServer;

[#133] feat(netty): Add StreamServer. #718

[#133] feat(netty): Add StreamServer. #718

Conversation

leixm commented Mar 14, 2023

What changes were proposed in this pull request?

Why are the changes needed?

Does this PR introduce any user-facing change?

How was this patch tested?

codecov-commenter commented Mar 14, 2023 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jerqi commented Mar 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leixm commented Mar 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smallzhongfeng left a comment

Choose a reason for hiding this comment

leixm commented Mar 15, 2023

leixm commented Mar 15, 2023

jerqi left a comment • edited

Choose a reason for hiding this comment

codecov-commenter commented Mar 14, 2023 •

edited

jerqi left a comment •

edited