You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/07/17 00:44:01 UTC
[1/8] storm git commit: fix issue of high cpu usage when bolt idle
Repository: storm
Updated Branches:
refs/heads/master 9f75a265c -> df25048cb
fix issue of high cpu usage when bolt idle
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5141440b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5141440b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5141440b
Branch: refs/heads/master
Commit: 5141440bbd267ca954b19b990b77781b7795bd7b
Parents: 9906f85
Author: errordaiwa <xi...@outlook.com>
Authored: Thu Jul 9 10:40:20 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Thu Jul 9 10:40:20 2015 +0800
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5141440b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 932af16..1f2110d 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -94,7 +94,7 @@ public class DisruptorQueue implements IStatefulObject {
public void consumeBatchWhenAvailable(EventHandler<Object> handler) {
try {
final long nextSequence = _consumer.get() + 1;
- final long availableSequence = _barrier.waitFor(nextSequence, 10, TimeUnit.MILLISECONDS);
+ final long availableSequence = _barrier.waitFor(nextSequence, 1000, TimeUnit.MILLISECONDS);
if(availableSequence >= nextSequence) {
consumeBatchToCursor(availableSequence, handler);
}
[7/8] storm git commit: Merge branch 'STORM-935' of
https://github.com/errordaiwa/storm
Posted by ka...@apache.org.
Merge branch 'STORM-935' of https://github.com/errordaiwa/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7c46c7d5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c46c7d5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c46c7d5
Branch: refs/heads/master
Commit: 7c46c7d5babe7bb003232df110de6940904bfd96
Parents: 236a265 7be8368
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 17 07:18:22 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 17 07:18:22 2015 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
pom.xml | 2 +-
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 ++
storm-core/src/clj/backtype/storm/disruptor.clj | 4 ++--
storm-core/src/jvm/backtype/storm/Config.java | 7 +++++++
.../src/jvm/backtype/storm/utils/DisruptorQueue.java | 13 ++++++++++---
.../jvm/backtype/storm/utils/DisruptorQueueTest.java | 2 +-
8 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7c46c7d5/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7c46c7d5/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
[5/8] storm git commit: Merge branch 'STORM-929' into STORM-935
Posted by ka...@apache.org.
Merge branch 'STORM-929' into STORM-935
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/78c2adbe
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/78c2adbe
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/78c2adbe
Branch: refs/heads/master
Commit: 78c2adbe04d2d2c7e0224719a24b1412cf13595e
Parents: f3e973f 3e82028
Author: errordaiwa <xi...@outlook.com>
Authored: Tue Jul 14 12:40:45 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Tue Jul 14 12:40:45 2015 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 ++
storm-core/src/clj/backtype/storm/disruptor.clj | 4 ++--
storm-core/src/jvm/backtype/storm/Config.java | 7 +++++++
.../src/jvm/backtype/storm/utils/DisruptorQueue.java | 13 ++++++++++---
.../jvm/backtype/storm/utils/DisruptorQueueTest.java | 2 +-
7 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/78c2adbe/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index dba4ca0,195c2f7..4d3f18b
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@@ -94,8 -98,8 +98,11 @@@ public class DisruptorQueue implements
public void consumeBatchWhenAvailable(EventHandler<Object> handler) {
try {
final long nextSequence = _consumer.get() + 1;
- final long availableSequence = _barrier.waitFor(nextSequence);
- final long availableSequence = _barrier.waitFor(nextSequence, _waitTimeout, TimeUnit.MILLISECONDS);
-- if(availableSequence >= nextSequence) {
++ final long availableSequence =
++ _waitTimeout == 0L ? _barrier.waitFor(nextSequence) : _barrier.waitFor(nextSequence, _waitTimeout,
++ TimeUnit.MILLISECONDS);
++
++ if (availableSequence >= nextSequence) {
consumeBatchToCursor(availableSequence, handler);
}
} catch (AlertException e) {
[3/8] storm git commit: use NotNullPosIntegerValidator to verify
disruptor queue wait timeout config
Posted by ka...@apache.org.
use NotNullPosIntegerValidator to verify disruptor queue wait timeout config
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3e82028a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3e82028a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3e82028a
Branch: refs/heads/master
Commit: 3e82028a5a3fae3b9e0616fa85278e4a347b63e2
Parents: 68bd67c
Author: errordaiwa <xi...@outlook.com>
Authored: Fri Jul 10 14:20:09 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Fri Jul 10 14:20:09 2015 +0800
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3e82028a/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 f20f281..0ee5ab7 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1457,7 +1457,7 @@ public class Config extends HashMap<String, Object> {
* vs. CPU usage
*/
public static final String TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS="topology.disruptor.wait.timeout.millis";
- public static final Object TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS_SCHEMA = Number.class;
+ public static final Object TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS_SCHEMA = ConfigValidation.NotNullPosIntegerValidator;
public static void setClasspath(Map conf, String cp) {
conf.put(Config.TOPOLOGY_CLASSPATH, cp);
[4/8] storm git commit: update version of Disruptor queue to 2.10.4,
consumer of queue will use waitfor method without timeout
Posted by ka...@apache.org.
update version of Disruptor queue to 2.10.4, consumer of queue will use waitfor method without timeout
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3e973fa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3e973fa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3e973fa
Branch: refs/heads/master
Commit: f3e973fa4df7af68317e4e239c3c783756de1e75
Parents: 9906f85
Author: errordaiwa <xi...@outlook.com>
Authored: Mon Jul 13 17:46:16 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Mon Jul 13 17:46:16 2015 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f3e973fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc73c54..bd65f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@
<snakeyaml.version>1.11</snakeyaml.version>
<httpclient.version>4.3.3</httpclient.version>
<clojure.tools.cli.version>0.2.4</clojure.tools.cli.version>
- <disruptor.version>2.10.1</disruptor.version>
+ <disruptor.version>2.10.4</disruptor.version>
<jgrapht.version>0.9.0</jgrapht.version>
<guava.version>16.0.1</guava.version>
<netty.version>3.9.0.Final</netty.version>
http://git-wip-us.apache.org/repos/asf/storm/blob/f3e973fa/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 932af16..dba4ca0 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -94,7 +94,7 @@ public class DisruptorQueue implements IStatefulObject {
public void consumeBatchWhenAvailable(EventHandler<Object> handler) {
try {
final long nextSequence = _consumer.get() + 1;
- final long availableSequence = _barrier.waitFor(nextSequence, 10, TimeUnit.MILLISECONDS);
+ final long availableSequence = _barrier.waitFor(nextSequence);
if(availableSequence >= nextSequence) {
consumeBatchToCursor(availableSequence, handler);
}
[2/8] storm git commit: make disruptor queue wait timeout configurable
Posted by ka...@apache.org.
make disruptor queue wait timeout configurable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/68bd67c0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/68bd67c0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/68bd67c0
Branch: refs/heads/master
Commit: 68bd67c02af316e711fba98a37d853063e83884a
Parents: 5141440
Author: errordaiwa <xi...@outlook.com>
Authored: Fri Jul 10 11:00:28 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Fri Jul 10 11:00:28 2015 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 ++
storm-core/src/clj/backtype/storm/disruptor.clj | 4 ++--
storm-core/src/jvm/backtype/storm/Config.java | 7 +++++++
storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java | 8 ++++++--
.../test/jvm/backtype/storm/utils/DisruptorQueueTest.java | 2 +-
7 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 875543f..47dc266 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -200,5 +200,6 @@ topology.testing.always.try.serialize: false
topology.classpath: null
topology.environment: null
topology.bolts.outgoing.overflow.buffer.enable: false
+topology.disruptor.wait.timeout.millis: 10
dev.zookeeper.path: "/tmp/dev-storm-zookeeper"
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index 454fd0d..75414d0 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -223,6 +223,7 @@
batch-transfer->worker (disruptor/disruptor-queue
(str "executor" executor-id "-send-queue")
(storm-conf TOPOLOGY-EXECUTOR-SEND-BUFFER-SIZE)
+ (storm-conf TOPOLOGY-DISRUPTOR-WAIT-TIMEOUT-MILLIS)
:claim-strategy :single-threaded
:wait-strategy (storm-conf TOPOLOGY-DISRUPTOR-WAIT-STRATEGY))
]
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 7157cf7..2e64fb4 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -153,6 +153,7 @@
;; TODO: this depends on the type of executor
(map (fn [e] [e (disruptor/disruptor-queue (str "receive-queue" e)
(storm-conf TOPOLOGY-EXECUTOR-RECEIVE-BUFFER-SIZE)
+ (storm-conf TOPOLOGY-DISRUPTOR-WAIT-TIMEOUT-MILLIS)
:wait-strategy (storm-conf TOPOLOGY-DISRUPTOR-WAIT-STRATEGY))]))
(into {})
))
@@ -194,6 +195,7 @@
(let [assignment-versions (atom {})
executors (set (read-worker-executors storm-conf storm-cluster-state storm-id assignment-id port assignment-versions))
transfer-queue (disruptor/disruptor-queue "worker-transfer-queue" (storm-conf TOPOLOGY-TRANSFER-BUFFER-SIZE)
+ (storm-conf TOPOLOGY-DISRUPTOR-WAIT-TIMEOUT-MILLIS)
:wait-strategy (storm-conf TOPOLOGY-DISRUPTOR-WAIT-STRATEGY))
executor-receive-queue-map (mk-receive-queue-map storm-conf executors)
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/storm-core/src/clj/backtype/storm/disruptor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/disruptor.clj b/storm-core/src/clj/backtype/storm/disruptor.clj
index a723601..e96e49d 100644
--- a/storm-core/src/clj/backtype/storm/disruptor.clj
+++ b/storm-core/src/clj/backtype/storm/disruptor.clj
@@ -45,10 +45,10 @@
;; wouldn't make it to the acker until the batch timed out and another tuple was played into the queue,
;; unblocking the consumer
(defnk disruptor-queue
- [^String queue-name buffer-size :claim-strategy :multi-threaded :wait-strategy :block]
+ [^String queue-name buffer-size timeout :claim-strategy :multi-threaded :wait-strategy :block]
(DisruptorQueue. queue-name
((CLAIM-STRATEGY claim-strategy) buffer-size)
- (mk-wait-strategy wait-strategy)))
+ (mk-wait-strategy wait-strategy) timeout))
(defn clojure-handler
[afn]
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/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 063d446..f20f281 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1452,6 +1452,13 @@ public class Config extends HashMap<String, Object> {
public static final String TOPOLOGY_ISOLATED_MACHINES = "topology.isolate.machines";
public static final Object TOPOLOGY_ISOLATED_MACHINES_SCHEMA = Number.class;
+ /**
+ * Configure timeout milliseconds used for disruptor queue wait strategy. Can be used to tradeoff latency
+ * vs. CPU usage
+ */
+ public static final String TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS="topology.disruptor.wait.timeout.millis";
+ public static final Object TOPOLOGY_DISRUPTOR_WAIT_TIMEOUT_MILLIS_SCHEMA = Number.class;
+
public static void setClasspath(Map conf, String cp) {
conf.put(Config.TOPOLOGY_CLASSPATH, cp);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 1f2110d..195c2f7 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -60,8 +60,10 @@ public class DisruptorQueue implements IStatefulObject {
private static String PREFIX = "disruptor-";
private String _queueName = "";
+
+ private long _waitTimeout;
- public DisruptorQueue(String queueName, ClaimStrategy claim, WaitStrategy wait) {
+ public DisruptorQueue(String queueName, ClaimStrategy claim, WaitStrategy wait, long timeout) {
this._queueName = PREFIX + queueName;
_buffer = new RingBuffer<MutableObject>(new ObjectEventFactory(), claim, wait);
_consumer = new Sequence();
@@ -77,6 +79,8 @@ public class DisruptorQueue implements IStatefulObject {
throw new RuntimeException("This code should be unreachable!", e);
}
}
+
+ _waitTimeout = timeout;
}
public String getName() {
@@ -94,7 +98,7 @@ public class DisruptorQueue implements IStatefulObject {
public void consumeBatchWhenAvailable(EventHandler<Object> handler) {
try {
final long nextSequence = _consumer.get() + 1;
- final long availableSequence = _barrier.waitFor(nextSequence, 1000, TimeUnit.MILLISECONDS);
+ final long availableSequence = _barrier.waitFor(nextSequence, _waitTimeout, TimeUnit.MILLISECONDS);
if(availableSequence >= nextSequence) {
consumeBatchToCursor(availableSequence, handler);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/68bd67c0/storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java b/storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java
index 61af50d..ddc0982 100644
--- a/storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java
+++ b/storm-core/test/jvm/backtype/storm/utils/DisruptorQueueTest.java
@@ -154,6 +154,6 @@ public class DisruptorQueueTest extends TestCase {
private static DisruptorQueue createQueue(String name, int queueSize) {
return new DisruptorQueue(name, new MultiThreadedClaimStrategy(
- queueSize), new BlockingWaitStrategy());
+ queueSize), new BlockingWaitStrategy(), 10L);
}
}
[8/8] storm git commit: Merge branch 'STORM-935'
Posted by ka...@apache.org.
Merge branch 'STORM-935'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/df25048c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/df25048c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/df25048c
Branch: refs/heads/master
Commit: df25048cbc0c9884cc558f6c6e4ca118a38f930d
Parents: 9f75a26 7c46c7d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 17 07:37:54 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 17 07:37:54 2015 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
pom.xml | 2 +-
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 ++
storm-core/src/clj/backtype/storm/disruptor.clj | 4 ++--
storm-core/src/jvm/backtype/storm/Config.java | 7 +++++++
.../src/jvm/backtype/storm/utils/DisruptorQueue.java | 13 ++++++++++---
.../jvm/backtype/storm/utils/DisruptorQueueTest.java | 2 +-
8 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[6/8] storm git commit: change default disruptor queue timeout to
1000ms
Posted by ka...@apache.org.
change default disruptor queue timeout to 1000ms
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7be83684
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7be83684
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7be83684
Branch: refs/heads/master
Commit: 7be83684dc7cc2fa8067397cb159439e47122dc3
Parents: 78c2adb
Author: errordaiwa <xi...@outlook.com>
Authored: Thu Jul 16 09:02:17 2015 +0800
Committer: errordaiwa <xi...@outlook.com>
Committed: Thu Jul 16 09:02:17 2015 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7be83684/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 47dc266..76d9fca 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -200,6 +200,6 @@ topology.testing.always.try.serialize: false
topology.classpath: null
topology.environment: null
topology.bolts.outgoing.overflow.buffer.enable: false
-topology.disruptor.wait.timeout.millis: 10
+topology.disruptor.wait.timeout.millis: 1000
dev.zookeeper.path: "/tmp/dev-storm-zookeeper"