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 2016/05/16 08:46:54 UTC
[1/4] storm git commit: STORM-1750 (0.10.x): Ensure worker dies when
report-error-and-die is called. Make cluster set-data try setting data if
node creation fails because the node exists.
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch c4ce035ef -> 132c58c39
STORM-1750 (0.10.x): Ensure worker dies when report-error-and-die is called. Make cluster set-data try setting data if node creation fails because the node exists.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aaf3abf1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aaf3abf1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aaf3abf1
Branch: refs/heads/0.10.x-branch
Commit: aaf3abf1132db1f22789bd58875367ac75216e37
Parents: c4ce035
Author: Stig Rohde D�ssing <sd...@it-minds.dk>
Authored: Tue May 3 15:04:27 2016 +0200
Committer: Stig Rohde D�ssing <sd...@it-minds.dk>
Committed: Tue May 3 15:04:27 2016 +0200
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/cluster.clj | 9 +++++++--
storm-core/src/clj/backtype/storm/daemon/executor.clj | 5 ++++-
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aaf3abf1/storm-core/src/clj/backtype/storm/cluster.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj b/storm-core/src/clj/backtype/storm/cluster.clj
index 1a13f7b..174987f 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -18,7 +18,7 @@
(:import [org.apache.zookeeper.data Stat ACL Id]
[backtype.storm.generated SupervisorInfo Assignment StormBase ClusterWorkerHeartbeat ErrorInfo Credentials]
[java.io Serializable])
- (:import [org.apache.zookeeper KeeperException KeeperException$NoNodeException ZooDefs ZooDefs$Ids ZooDefs$Perms])
+ (:import [org.apache.zookeeper KeeperException KeeperException$NoNodeException KeeperException$NodeExistsException ZooDefs ZooDefs$Ids ZooDefs$Perms])
(:import [backtype.storm.utils Utils])
(:import [java.security MessageDigest])
(:import [org.apache.zookeeper.server.auth DigestAuthenticationProvider])
@@ -103,7 +103,12 @@
(zk/set-data zk path data)
(do
(zk/mkdirs zk (parent-path path) acls)
- (zk/create-node zk path data :persistent acls))))
+ (try
+ (zk/create-node zk path data :persistent acls)
+ (catch RuntimeException e
+ (if (instance? KeeperException$NodeExistsException (.getCause e))
+ (zk/set-data zk path data)
+ (throw e)))))))
(delete-node
[this path]
http://git-wip-us.apache.org/repos/asf/storm/blob/aaf3abf1/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 12fec2a..57fdc4b 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -253,7 +253,10 @@
:stream->component->grouper (outbound-components worker-context component-id)
:report-error (throttled-report-error-fn <>)
:report-error-and-die (fn [error]
- ((:report-error <>) error)
+ (try
+ ((:report-error <>) error)
+ (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))
[3/4] storm git commit: Merge branch 'STORM-1750-0.10.x' of
https://github.com/srdo/storm into STORM-1750-0.10.x
Posted by ka...@apache.org.
Merge branch 'STORM-1750-0.10.x' of https://github.com/srdo/storm into STORM-1750-0.10.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/97452d15
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/97452d15
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/97452d15
Branch: refs/heads/0.10.x-branch
Commit: 97452d155d86ec1b90aae2929913d529b7f364dd
Parents: c4ce035 b66f907
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 17:46:04 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 17:46:04 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/cluster.clj | 7 +++++--
storm-core/src/clj/backtype/storm/daemon/executor.clj | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: STORM-1750: Replace manual check for
exception cause with try-cause
Posted by ka...@apache.org.
STORM-1750: Replace manual check for exception cause with try-cause
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b66f9071
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b66f9071
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b66f9071
Branch: refs/heads/0.10.x-branch
Commit: b66f9071378d556edbb55dce1b864d4f59a07788
Parents: aaf3abf
Author: Stig Rohde D�ssing <st...@gmail.com>
Authored: Thu May 5 11:12:52 2016 +0200
Committer: Stig Rohde D�ssing <st...@gmail.com>
Committed: Thu May 5 11:12:52 2016 +0200
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/cluster.clj | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b66f9071/storm-core/src/clj/backtype/storm/cluster.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj b/storm-core/src/clj/backtype/storm/cluster.clj
index 174987f..7c603b3 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -103,12 +103,10 @@
(zk/set-data zk path data)
(do
(zk/mkdirs zk (parent-path path) acls)
- (try
+ (try-cause
(zk/create-node zk path data :persistent acls)
- (catch RuntimeException e
- (if (instance? KeeperException$NodeExistsException (.getCause e))
- (zk/set-data zk path data)
- (throw e)))))))
+ (catch KeeperException$NodeExistsException e
+ (zk/set-data zk path data))))))
(delete-node
[this path]
[4/4] storm git commit: add STORM-1750 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1750 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/132c58c3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/132c58c3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/132c58c3
Branch: refs/heads/0.10.x-branch
Commit: 132c58c394e54b247d3e584bcf385b857f821dc0
Parents: 97452d1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 16 17:46:36 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 16 17:46:36 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/132c58c3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99cfe6f..09cbf6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.2
+ * STORM-1750: Ensure worker dies when report-error-and-die is called.
* STORM-1739: update the minor JAVA version dependency in 0.10.0 and above
* STORM-1733: Flush stdout and stderr before calling "os.execvp" to prevent log loss