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 2017/04/04 13:18:11 UTC
[1/3] storm git commit: [STORM-2440] Kill process if executor catches
`java.net.SocketTimeoutException`
Repository: storm
Updated Branches:
refs/heads/1.x-branch 7bda27381 -> cf7498aea
[STORM-2440] Kill process if executor catches `java.net.SocketTimeoutException`
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ccdbe7f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ccdbe7f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ccdbe7f
Branch: refs/heads/1.x-branch
Commit: 7ccdbe7fa43d8840680f029db382fa5d3cb2fa4d
Parents: 8ab85bf
Author: Nico Meyer <ni...@adition.com>
Authored: Fri Mar 31 16:02:05 2017 +0200
Committer: Nico Meyer <ni...@adition.com>
Committed: Mon Apr 3 11:29:43 2017 +0200
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7ccdbe7f/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
index 8c7d026..8126a80 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -268,8 +268,10 @@
(catch Exception e
(log-message "Error while reporting error to cluster, proceeding with shutdown")))
(if (or
- (exception-cause? InterruptedException error)
- (exception-cause? java.io.InterruptedIOException error))
+ (exception-cause? InterruptedException error)
+ (and
+ (exception-cause? java.io.InterruptedIOException error)
+ (not (exception-cause? java.net.SocketTimeoutException error))))
(log-message "Got interrupted excpetion shutting thread down...")
((:suicide-fn <>))))
:sampler (mk-stats-sampler storm-conf)
[3/3] storm git commit: STORM-2194: CHANGEGLOG
Posted by ka...@apache.org.
STORM-2194: CHANGEGLOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cf7498ae
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cf7498ae
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cf7498ae
Branch: refs/heads/1.x-branch
Commit: cf7498aea6cff5e5ce2d57dcfd17966f79f5305f
Parents: 946c003
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Apr 4 22:17:57 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Apr 4 22:17:57 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/cf7498ae/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a816dc1..60423a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 1.1.1
+ * STORM-2194: Stop ignoring socket timeout error from executor
* STORM-2451: windows storm.cmd does not set log4j2 config file correctly by default
## 1.1.0
[2/3] storm git commit: Merge branch 'DEV-2440' of
https://github.com/nicom/storm into STORM-2440-1.x-merge
Posted by ka...@apache.org.
Merge branch 'DEV-2440' of https://github.com/nicom/storm into STORM-2440-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/946c0032
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/946c0032
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/946c0032
Branch: refs/heads/1.x-branch
Commit: 946c0032063bdbc2aaba8743eadfa486875396d9
Parents: 7bda273 7ccdbe7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Apr 4 22:16:29 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Apr 4 22:16:29 2017 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/executor.clj | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------