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 2014/06/09 15:48:09 UTC
[04/32] git commit: STORM-257, update the config name in defaults.yaml
STORM-257, update the config name in defaults.yaml
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/2812e511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/2812e511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/2812e511
Branch: refs/heads/master
Commit: 2812e511c025f39308ba30be921ed0ab01d15e94
Parents: 70a46be
Author: Sean Zhong <cl...@gmail.com>
Authored: Thu May 8 10:05:49 2014 +0800
Committer: Sean Zhong <cl...@gmail.com>
Committed: Thu May 8 10:05:49 2014 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 5 +++++
storm-core/src/jvm/backtype/storm/Config.java | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2812e511/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 2dbba24..4c15fce 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -93,6 +93,7 @@ supervisor.enable: true
### worker.* configs are for task workers
worker.childopts: "-Xmx768m"
worker.heartbeat.frequency.secs: 1
+worker.receiver.thread.count: 1
task.heartbeat.frequency.secs: 3
task.refresh.poll.secs: 10
@@ -108,6 +109,10 @@ storm.messaging.netty.buffer_size: 5242880 #5MB buffer
storm.messaging.netty.max_retries: 30
storm.messaging.netty.max_wait_ms: 1000
storm.messaging.netty.min_wait_ms: 100
+storm.messaging.netty.transfer.batch.size: 262144
+storm.messaging.netty.blocking: false
+storm.messaging.netty.flush.check.interval.ms: 10
+
### topology.* configs are for specific executing storms
topology.enable.message.timeouts: true
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2812e511/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 98718a3..fa5d9d1 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -88,19 +88,19 @@ public class Config extends HashMap<String, Object> {
/**
* If the Netty messaging layer is busy, the Netty client will try to batch message as more as possible up to the size of STORM_NETTY_MESSAGE_BATCH_SIZE bytes
*/
- public static final String STORM_NETTY_MESSAGE_BATCH_SIZE = "netty.transfer.batch.size";
+ public static final String STORM_NETTY_MESSAGE_BATCH_SIZE = "storm.messaging.netty.transfer.batch.size";
public static final Object STORM_NETTY_MESSAGE_BATCH_SIZE_SCHEMA = Number.class;
/**
* This control whether we do Netty message transfer in a synchronized way or async way.
*/
- public static final String STORM_NETTY_BLOCKING = "netty.blocking";
+ public static final String STORM_NETTY_BLOCKING = "storm.messaging.netty.blocking";
public static final Object STORM_NETTY_BLOCKING_SCHEMA = Boolean.class;
/**
* We check with this interval that whether the Netty channel is writable and try to write pending messages
*/
- public static final String STORM_NETTY_FLUSH_CHECK_INTERVAL_MS = "netty.flush.check.interval.ms";
+ public static final String STORM_NETTY_FLUSH_CHECK_INTERVAL_MS = "storm.messaging.netty.flush.check.interval.ms";
public static final Object STORM_NETTY_FLUSH_CHECK_INTERVAL_MS_SCHEMA = Number.class;