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/12/02 16:44:45 UTC

[2/8] storm git commit: STORM-756 set default value of topology.shellbolt.max.pending

STORM-756 set default value of topology.shellbolt.max.pending

* Bounded _pendingWrites makes ShellBolt play well with ABP


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d91c393f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d91c393f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d91c393f

Branch: refs/heads/master
Commit: d91c393f092ad2e050f14bc3c6ab9e9658545c26
Parents: a16eca7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Nov 22 18:56:50 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Nov 22 23:12:36 2015 +0900

----------------------------------------------------------------------
 conf/defaults.yaml                            | 1 +
 storm-core/src/jvm/backtype/storm/Config.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d91c393f/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index b520745..34746d6 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -205,6 +205,7 @@ topology.tasks: null
 # maximum amount of time a message has to complete before it's considered failed
 topology.message.timeout.secs: 30
 topology.multilang.serializer: "backtype.storm.multilang.JsonSerializer"
+topology.shellbolt.max.pending: 100
 topology.skip.missing.kryo.registrations: false
 topology.max.task.parallelism: null
 topology.max.spout.pending: null

http://git-wip-us.apache.org/repos/asf/storm/blob/d91c393f/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 a1da8fe..7b18595 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1652,6 +1652,7 @@ public class Config extends HashMap<String, Object> {
     /**
      * Max pending tuples in one ShellBolt
      */
+    @NotNull
     @isInteger
     @isPositiveNumber
     public static final String TOPOLOGY_SHELLBOLT_MAX_PENDING="topology.shellbolt.max.pending";