Skip to content

[CELEBORN-2258][FOLLOWUP] Use IoHandlerFactories for EventLoopGroups to replace deprecated transport-specific event loop groups #3669

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

Closed
SteNicholas wants to merge 1 commit into from
+23 −15
Closed

[CELEBORN-2258][FOLLOWUP] Use IoHandlerFactories for EventLoopGroups to replace deprecated transport-specific event loop groups #3669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions common/src/main/java/org/apache/celeborn/common/network/util/NettyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

package org.apache.celeborn.common.network.util;

import java.nio.channels.spi.SelectorProvider;
import static org.apache.celeborn.common.network.util.IOMode.NIO;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -31,16 +32,17 @@
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.channel.Channel;
import io.netty.channel.DefaultSelectStrategyFactory;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.IoHandlerFactory;
import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.ServerChannel;
import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.epoll.EpollIoHandler;
import io.netty.channel.epoll.EpollServerSocketChannel;
import io.netty.channel.epoll.EpollSocketChannel;
import io.netty.channel.kqueue.KQueueEventLoopGroup;
import io.netty.channel.kqueue.KQueueIoHandler;
import io.netty.channel.kqueue.KQueueServerSocketChannel;
import io.netty.channel.kqueue.KQueueSocketChannel;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.concurrent.DefaultThreadFactory;
Expand Down Expand Up @@ -75,23 +77,29 @@ public static EventLoopGroup createEventLoop(
IOMode mode, int numThreads, boolean conflictAvoidChooserEnable, String threadPrefix) {
ThreadFactory threadFactory = createThreadFactory(threadPrefix);

IoHandlerFactory handlerFactory;
switch (mode) {
case NIO:
return conflictAvoidChooserEnable
? new NioEventLoopGroup(
numThreads,
new ThreadPerTaskExecutor(threadFactory),
ConflictAvoidEventExecutorChooserFactory.INSTANCE,
SelectorProvider.provider(),
DefaultSelectStrategyFactory.INSTANCE)
: new NioEventLoopGroup(numThreads, threadFactory);
handlerFactory = NioIoHandler.newFactory();
break;
case EPOLL:
return new EpollEventLoopGroup(numThreads, threadFactory);
handlerFactory = EpollIoHandler.newFactory();
break;
case KQUEUE:
return new KQueueEventLoopGroup(numThreads, threadFactory);
handlerFactory = KQueueIoHandler.newFactory();
break;
default:
throw new IllegalArgumentException("Unknown io mode: " + mode);
}
if (mode == NIO && conflictAvoidChooserEnable) {
return new MultiThreadIoEventLoopGroup(
numThreads,
new ThreadPerTaskExecutor(threadFactory),
ConflictAvoidEventExecutorChooserFactory.INSTANCE,
handlerFactory);
} else {
return new MultiThreadIoEventLoopGroup(numThreads, threadFactory, handlerFactory);
}
}

/** Returns the correct (client) SocketChannel class based on IOMode. */
Expand Down
Loading