You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@uniffle.apache.org by "advancedxy (via GitHub)" <gi...@apache.org> on 2023/03/14 13:55:07 UTC
[GitHub] [incubator-uniffle] advancedxy commented on a diff in pull request #718: [#133] feat(netty): Add StreamServer.
advancedxy commented on code in PR #718:
URL: https://github.com/apache/incubator-uniffle/pull/718#discussion_r1135574599
##########
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;
Review Comment:
Maybe >= 0?
@jerqi could you also add port=0 for random port binding?
##########
server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java:
##########
@@ -404,6 +404,58 @@ public class ShuffleServerConf extends RssBaseConf {
.defaultValue(-1)
.withDescription("Shuffle netty server port");
+ public static final ConfigOption<Boolean> NETTY_SERVER_EPOLL_ENABLE = ConfigOptions
+ .key("rss.server.netty.epoll.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("If enable epoll model with netty server");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_ACCEPT_THREAD = ConfigOptions
+ .key("rss.server.netty.accept.thread")
+ .intType()
+ .defaultValue(10)
+ .withDescription("Accept thread count in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_WORKER_THREAD = ConfigOptions
+ .key("rss.server.netty.worker.thread")
+ .intType()
+ .defaultValue(100)
+ .withDescription("Worker thread count in netty");
+
+ public static final ConfigOption<Long> SERVER_NETTY_HANDLER_IDLE_TIMEOUT = ConfigOptions
+ .key("rss.server.netty.handler.idle.timeout")
+ .longType()
+ .defaultValue(60000L)
+ .withDescription("Idle timeout if there has not data");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_BACKLOG = ConfigOptions
+ .key("rss.server.netty.connect.backlog")
+ .intType()
+ .defaultValue(1000)
Review Comment:
is 1000 enough?
##########
server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java:
##########
@@ -404,6 +404,58 @@ public class ShuffleServerConf extends RssBaseConf {
.defaultValue(-1)
.withDescription("Shuffle netty server port");
+ public static final ConfigOption<Boolean> NETTY_SERVER_EPOLL_ENABLE = ConfigOptions
+ .key("rss.server.netty.epoll.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("If enable epoll model with netty server");
Review Comment:
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?
##########
server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java:
##########
@@ -404,6 +404,58 @@ public class ShuffleServerConf extends RssBaseConf {
.defaultValue(-1)
.withDescription("Shuffle netty server port");
+ public static final ConfigOption<Boolean> NETTY_SERVER_EPOLL_ENABLE = ConfigOptions
+ .key("rss.server.netty.epoll.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("If enable epoll model with netty server");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_ACCEPT_THREAD = ConfigOptions
+ .key("rss.server.netty.accept.thread")
+ .intType()
+ .defaultValue(10)
+ .withDescription("Accept thread count in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_WORKER_THREAD = ConfigOptions
+ .key("rss.server.netty.worker.thread")
+ .intType()
+ .defaultValue(100)
+ .withDescription("Worker thread count in netty");
+
+ public static final ConfigOption<Long> SERVER_NETTY_HANDLER_IDLE_TIMEOUT = ConfigOptions
+ .key("rss.server.netty.handler.idle.timeout")
+ .longType()
+ .defaultValue(60000L)
+ .withDescription("Idle timeout if there has not data");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_BACKLOG = ConfigOptions
+ .key("rss.server.netty.connect.backlog")
+ .intType()
+ .defaultValue(1000)
+ .withDescription("Backlog for connection in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_TIMEOUT = ConfigOptions
+ .key("rss.server.netty.connect.timeout")
+ .intType()
+ .defaultValue(5000)
+ .withDescription("Timeout for connection in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_SEND_BUF = ConfigOptions
+ .key("rss.server.netty.send.buf")
+ .intType()
+ .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");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_RECEIVE_BUF = ConfigOptions
+ .key("rss.server.netty.receive.buf")
+ .intType()
+ .defaultValue(-1)
+ .withDescription("the optimal size for receive buffer(SO_RCVBUF) "
Review Comment:
ditto.
##########
server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java:
##########
@@ -404,6 +404,58 @@ public class ShuffleServerConf extends RssBaseConf {
.defaultValue(-1)
.withDescription("Shuffle netty server port");
+ public static final ConfigOption<Boolean> NETTY_SERVER_EPOLL_ENABLE = ConfigOptions
+ .key("rss.server.netty.epoll.enable")
+ .booleanType()
+ .defaultValue(false)
+ .withDescription("If enable epoll model with netty server");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_ACCEPT_THREAD = ConfigOptions
+ .key("rss.server.netty.accept.thread")
+ .intType()
+ .defaultValue(10)
+ .withDescription("Accept thread count in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_WORKER_THREAD = ConfigOptions
+ .key("rss.server.netty.worker.thread")
+ .intType()
+ .defaultValue(100)
+ .withDescription("Worker thread count in netty");
+
+ public static final ConfigOption<Long> SERVER_NETTY_HANDLER_IDLE_TIMEOUT = ConfigOptions
+ .key("rss.server.netty.handler.idle.timeout")
+ .longType()
+ .defaultValue(60000L)
+ .withDescription("Idle timeout if there has not data");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_BACKLOG = ConfigOptions
+ .key("rss.server.netty.connect.backlog")
+ .intType()
+ .defaultValue(1000)
+ .withDescription("Backlog for connection in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_CONNECT_TIMEOUT = ConfigOptions
+ .key("rss.server.netty.connect.timeout")
+ .intType()
+ .defaultValue(5000)
+ .withDescription("Timeout for connection in netty");
+
+ public static final ConfigOption<Integer> NETTY_SERVER_SEND_BUF = ConfigOptions
+ .key("rss.server.netty.send.buf")
+ .intType()
+ .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");
Review Comment:
Add some desc about what the default value `-1` means?
##########
server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java:
##########
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.uniffle.server.netty;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.uniffle.common.util.ExitUtils;
+import org.apache.uniffle.server.ShuffleServer;
+import org.apache.uniffle.server.ShuffleServerConf;
+import org.apache.uniffle.server.netty.decoder.StreamServerInitDecoder;
+
+public class StreamServer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(StreamServer.class);
+
+ private ShuffleServer shuffleServer;
+ private EventLoopGroup shuffleBossGroup;
+ private EventLoopGroup shuffleWorkerGroup;
+ private ShuffleServerConf shuffleServerConf;
+ private ChannelFuture channelFuture;
+
+ public StreamServer(ShuffleServer shuffleServer) {
+ this.shuffleServer = shuffleServer;
+ this.shuffleServerConf = shuffleServer.getShuffleServerConf();
+ boolean isEpollEnable = shuffleServerConf.getBoolean(ShuffleServerConf.NETTY_SERVER_EPOLL_ENABLE);
+ int acceptThreads = shuffleServerConf.getInteger(ShuffleServerConf.NETTY_SERVER_ACCEPT_THREAD);
+ int workerThreads = shuffleServerConf.getInteger(ShuffleServerConf.NETTY_SERVER_WORKER_THREAD);
+ if (isEpollEnable) {
+ shuffleBossGroup = new EpollEventLoopGroup(acceptThreads);
+ shuffleWorkerGroup = new EpollEventLoopGroup(workerThreads);
+ } else {
+ shuffleBossGroup = new NioEventLoopGroup(acceptThreads);
+ shuffleWorkerGroup = new NioEventLoopGroup(workerThreads);
+ }
+ }
+
+ private ServerBootstrap bootstrapChannel(
+ EventLoopGroup bossGroup,
+ EventLoopGroup workerGroup,
+ int backlogSize,
+ int timeoutMillis,
+ int sendBuf,
+ int receiveBuf,
+ Supplier<ChannelHandler[]> handlerSupplier) {
+ ServerBootstrap serverBootstrap = bossGroup instanceof EpollEventLoopGroup
+ ? new ServerBootstrap().group(bossGroup, workerGroup)
+ .channel(EpollServerSocketChannel.class)
+ : new ServerBootstrap().group(bossGroup, workerGroup)
Review Comment:
nit: the indentation looks a bit weird..
##########
server/src/main/java/org/apache/uniffle/server/netty/StreamServer.java:
##########
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.uniffle.server.netty;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.uniffle.common.util.ExitUtils;
+import org.apache.uniffle.server.ShuffleServer;
+import org.apache.uniffle.server.ShuffleServerConf;
+import org.apache.uniffle.server.netty.decoder.StreamServerInitDecoder;
+
+public class StreamServer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(StreamServer.class);
+
+ private ShuffleServer shuffleServer;
+ private EventLoopGroup shuffleBossGroup;
+ private EventLoopGroup shuffleWorkerGroup;
+ private ShuffleServerConf shuffleServerConf;
+ private ChannelFuture channelFuture;
+
+ public StreamServer(ShuffleServer shuffleServer) {
Review Comment:
The UTs of this class would be added in later PRs?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@uniffle.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@uniffle.apache.org
For additional commands, e-mail: issues-help@uniffle.apache.org