You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/01/09 19:42:59 UTC
[4/6] storm git commit: STORM-552:rename
storm.messaging.netty.backlog to storm.messaging.netty.socket.backlog
STORM-552:rename storm.messaging.netty.backlog to storm.messaging.netty.socket.backlog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/93cf2c1d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/93cf2c1d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/93cf2c1d
Branch: refs/heads/master
Commit: 93cf2c1d81a475bcb156a3ab8f519e8830c7d1f7
Parents: 1482915
Author: caofangkun <ca...@gmail.com>
Authored: Wed Dec 24 10:46:08 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Dec 24 10:46:08 2014 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 4 ++--
storm-core/src/jvm/backtype/storm/messaging/netty/Server.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 5e40c3c..eb8e029 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -153,7 +153,7 @@ storm.messaging.netty.min_wait_ms: 100
# If the Netty messaging layer is busy(netty internal buffer not writable), the Netty client will try to batch message as more as possible up to the size of storm.messaging.netty.transfer.batch.size bytes, otherwise it will try to flush message as soon as possible to reduce latency.
storm.messaging.netty.transfer.batch.size: 262144
# Sets the backlog value to specify when the channel binds to a local address
-storm.messaging.netty.backlog: 500
+storm.messaging.netty.socket.backlog: 500
# We check with this interval that whether the Netty channel is writable and try to write pending messages if it is.
storm.messaging.netty.flush.check.interval.ms: 10
http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 5a0157c..5cc1f9c 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -64,8 +64,8 @@ public class Config extends HashMap<String, Object> {
/**
* Netty based messaging: Sets the backlog value to specify when the channel binds to a local address
*/
- public static final String STORM_MESSAGING_NETTY_BACKLOG = "storm.messaging.netty.backlog";
- public static final Object STORM_MESSAGING_NETTY_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
+ public static final String STORM_MESSAGING_NETTY_SOCKET_BACKLOG = "storm.messaging.netty.socket.backlog";
+ public static final Object STORM_MESSAGING_NETTY_SOCKET_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
/**
* Netty based messaging: The max # of retries that a peer will perform when a remote is not accessible
http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
index 592f53a..d1f10e1 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
@@ -89,7 +89,7 @@ class Server implements IConnection, IStatefulObject {
// Configure the server.
int buffer_size = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
- int backlog = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BACKLOG), 500);
+ int backlog = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SOCKET_BACKLOG), 500);
int maxWorkers = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS));
ThreadFactory bossFactory = new NettyRenameThreadFactory(name() + "-boss");