From 272fe3b82efa874cc1560778670c627c68007831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=82=85=E5=86=B2?= Date: Wed, 1 Nov 2017 09:43:18 +0800 Subject: [PATCH 1/2] [ROCKETMQ-308] nameserver socket buffer use default value. (cherry picked from commit e9fcb07) --- .../java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index 760a61be02f..b03fcbe10ab 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -49,15 +49,6 @@ public static void main(String[] args) { public static NamesrvController main0(String[] args) { System.setProperty(RemotingCommand.REMOTING_VERSION_KEY, Integer.toString(MQVersion.CURRENT_VERSION)); - - if (null == System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_SNDBUF_SIZE)) { - NettySystemConfig.socketSndbufSize = 4096; - } - - if (null == System.getProperty(NettySystemConfig.COM_ROCKETMQ_REMOTING_SOCKET_RCVBUF_SIZE)) { - NettySystemConfig.socketRcvbufSize = 4096; - } - try { //PackageConflictDetect.detectFastjson(); From 6f0f370a589522b37190afe589820b3e204011f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=82=85=E5=86=B2?= Date: Wed, 1 Nov 2017 09:55:08 +0800 Subject: [PATCH 2/2] [ROCKETMQ-308] delete unused import (cherry picked from commit 3bcefff) --- .../main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java | 1 - 1 file changed, 1 deletion(-) diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java index b03fcbe10ab..0a0c6562d6f 100644 --- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java +++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java @@ -32,7 +32,6 @@ import org.apache.rocketmq.common.constant.LoggerName; import org.apache.rocketmq.common.namesrv.NamesrvConfig; import org.apache.rocketmq.remoting.netty.NettyServerConfig; -import org.apache.rocketmq.remoting.netty.NettySystemConfig; import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.srvutil.ServerUtil; import org.apache.rocketmq.srvutil.ShutdownHookThread;