Use rss.rpc.server.type to judge whether Netty is enabled or not

apache · Feb 21, 2024 · d84cf09 · d84cf09
1 parent d159181
commit d84cf09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
@@ -39,6 +39,7 @@
 
 import org.apache.uniffle.common.ShuffleDataResult;
 import org.apache.uniffle.common.ShufflePartitionedData;
+import org.apache.uniffle.common.rpc.ServerType;
 import org.apache.uniffle.common.rpc.StatusCode;
 import org.apache.uniffle.common.util.Constants;
 import org.apache.uniffle.common.util.JavaUtils;
@@ -83,7 +84,7 @@ public class ShuffleBufferManager {
   protected Map<String, Map<Integer, AtomicLong>> shuffleSizeMap = JavaUtils.newConcurrentMap();
 
   public ShuffleBufferManager(ShuffleServerConf conf, ShuffleFlushManager shuffleFlushManager) {
-    this.nettyServerEnabled = conf.get(ShuffleServerConf.NETTY_SERVER_PORT) >= 0;
+    this.nettyServerEnabled = conf.get(ShuffleServerConf.RPC_SERVER_TYPE) == ServerType.GRPC_NETTY;
     long heapSize = Runtime.getRuntime().maxMemory();
     this.capacity = conf.getSizeAsBytes(ShuffleServerConf.SERVER_BUFFER_CAPACITY);
     if (this.capacity < 0) {

diff --git a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
@@ -137,7 +137,7 @@ public void handleSendShuffleDataRequest(TransportClient client, SendShuffleData
                 + appId
                 + "], shuffleId["
                 + shuffleId
-                + "], probably due to the pre-allocated buffer has expired. "
+                + "], probably because the pre-allocated buffer has expired. "
                 + "Please increase the expiration time using "
                 + ShuffleServerConf.SERVER_PRE_ALLOCATION_EXPIRED.key()
                 + " in ShuffleServer's configuration";