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/04/20 15:54:41 UTC
[1/3] storm git commit: STORM-773: Transactional test timout too low
on restart STORM-772: Interrupted and InterruptedIOException failures fixed
Repository: storm
Updated Branches:
refs/heads/master e910819c4 -> 2b41f60e7
STORM-773: Transactional test timout too low on restart
STORM-772: Interrupted and InterruptedIOException failures fixed
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/933972ab
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/933972ab
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/933972ab
Branch: refs/heads/master
Commit: 933972abb47aa9b4ad87bc92d3ad7f79d21c9aee
Parents: a7c8310
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Apr 16 15:58:37 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Apr 16 15:58:37 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/executor.clj | 6 +++++-
storm-core/test/clj/backtype/storm/transactional_test.clj | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/933972ab/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 7f688ed..5ca1b54 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -253,7 +253,11 @@
:report-error (throttled-report-error-fn <>)
:report-error-and-die (fn [error]
((:report-error <>) error)
- ((:suicide-fn <>)))
+ (if (or
+ (exception-cause? InterruptedException error)
+ (exception-cause? java.io.InterruptedIOException error))
+ (log-message "Got interrupted excpetion shutting thread down...")
+ ((:suicide-fn <>))))
:deserializer (KryoTupleDeserializer. storm-conf worker-context)
:sampler (mk-stats-sampler storm-conf)
;; TODO: add in the executor-specific stuff in a :specific... or make a spout-data, bolt-data function?
http://git-wip-us.apache.org/repos/asf/storm/blob/933972ab/storm-core/test/clj/backtype/storm/transactional_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/transactional_test.clj b/storm-core/test/clj/backtype/storm/transactional_test.clj
index 95e3690..fc9137d 100644
--- a/storm-core/test/clj/backtype/storm/transactional_test.clj
+++ b/storm-core/test/clj/backtype/storm/transactional_test.clj
@@ -603,6 +603,8 @@
(bind results (complete-topology cluster
(.buildTopology builder)
+ :storm-conf {TOPOLOGY-DEBUG true
+ TOPOLOGY-MESSAGE-TIMEOUT-SECS 300} ;;simulated time can take a while for things to calm down
:cleanup-state false))
(is (ms= [[5] [0] [1] [0]] (->> (read-tuples results "count")
@@ -615,7 +617,9 @@
["b"]]
})
- (bind results (complete-topology cluster (.buildTopology builder)))
+ (bind results (complete-topology cluster (.buildTopology builder)
+ :storm-conf {TOPOLOGY-DEBUG true
+ TOPOLOGY-MESSAGE-TIMEOUT-SECS 300}))
;; need to do it this way (check for nothing transaction) because there is one transaction already saved up before that emits nothing (because of how memorytransctionalspout detects partition completion)
(is (ms= [[0] [0] [2] [0]] (->> (read-tuples results "count")
[3/3] storm git commit: Added STORM-773 and STORM-772 to Changelog.
Posted by bo...@apache.org.
Added STORM-773 and STORM-772 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b41f60e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b41f60e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b41f60e
Branch: refs/heads/master
Commit: 2b41f60e7feb3703eac32d99f7235a3be83a6190
Parents: c7575a2
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 20 08:53:48 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 20 08:53:48 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2b41f60e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c30b2..e6d2b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
## 0.11.0
+ * STORM-773: backtype.storm.transactional-test fails periodically with timeout
+ * STORM-772: Tasts fail periodically with InterruptedException or InterruptedIOException
* STORM-563: Kafka Spout doesn't pick up from the beginning of the queue unless forceFromStart specified.
* STORM-765: Thrift serialization for local state
* STORM-762: uptime for worker heartbeats is lost when converted to thrift
[2/3] storm git commit: Merge branch 'STORM-773' of
https://github.com/revans2/incubator-storm into STORM-773
Posted by bo...@apache.org.
Merge branch 'STORM-773' of https://github.com/revans2/incubator-storm into STORM-773
STORM-773: STORM-772: Transactional test timeout too low on restart, and InterruptedException
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c7575a2f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c7575a2f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c7575a2f
Branch: refs/heads/master
Commit: c7575a2f7d0a2b4b0c985516b9d7cca2f8376e2a
Parents: e910819 933972a
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 20 08:46:14 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 20 08:46:14 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/executor.clj | 6 +++++-
storm-core/test/clj/backtype/storm/transactional_test.clj | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------