You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/03/22 07:03:12 UTC
[1/3] storm git commit: STORM-1604:Delayed transition should handle
NotALeaderException
Repository: storm
Updated Branches:
refs/heads/1.x-branch 2d9f9036f -> eac26a7ae
STORM-1604:Delayed transition should handle NotALeaderException
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26b74e16
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26b74e16
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26b74e16
Branch: refs/heads/1.x-branch
Commit: 26b74e168aa1e25bd9f40afd935992e722dae275
Parents: e5c23a9
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Fri Mar 4 16:09:09 2016 -0800
Committer: Parth Brahmbhatt <pb...@netflix.com>
Committed: Mon Mar 21 14:40:28 2016 -0700
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/26b74e16/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index ec5a624..2d8a684 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -373,8 +373,8 @@
(log-message "Delaying event " event " for " delay-secs " secs for " storm-id)
(schedule (:timer nimbus)
delay-secs
- #(transition! nimbus storm-id event false)
- ))
+ #(try (transition! nimbus storm-id event false)
+ (catch Exception e (log-error e "Exception while trying transition for " storm-id " and event " event)))))
;; active -> reassign in X secs
[2/3] storm git commit: Merge branch 'STORM-1604' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-1604
Posted by sr...@apache.org.
Merge branch 'STORM-1604' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-1604
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3efc417f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3efc417f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3efc417f
Branch: refs/heads/1.x-branch
Commit: 3efc417f0176d92548748b6d60a4699227dde20f
Parents: 2d9f903 26b74e1
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Mar 21 22:36:42 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Mar 21 22:36:42 2016 -0700
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3efc417f/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1604 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1604 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/eac26a7a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eac26a7a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eac26a7a
Branch: refs/heads/1.x-branch
Commit: eac26a7aeb5108df2ea44e077605cad817928561
Parents: 3efc417
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Mar 21 22:59:26 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Mar 21 22:59:26 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/eac26a7a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d34c58..97eac05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1604: Delayed transition should handle NotALeaderException
* STORM-1602: Blobstore UTs are failed on Windows
* STORM-1629: Files/move doesn't work properly with non-empty directory in Windows
* STORM-1616: Add RAS API for Trident