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 2015/03/13 00:02:59 UTC
[1/3] storm git commit: STORM-682: supervisor should handle worker
state corruption gracefully.
Repository: storm
Updated Branches:
refs/heads/master 117256b60 -> 73a7f5d73
STORM-682: supervisor should handle worker state corruption gracefully.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca7bd99b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca7bd99b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca7bd99b
Branch: refs/heads/master
Commit: ca7bd99beff75e592c6abc9ba5186633d00f0fe4
Parents: a8eab50
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Fri Feb 20 11:56:22 2015 -0800
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Mon Feb 23 10:08:25 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 7 +++++--
storm-core/src/jvm/backtype/storm/utils/VersionedStore.java | 9 +++++----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ca7bd99b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index a5d5aef..a040f06 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -97,8 +97,11 @@
(defn read-worker-heartbeat [conf id]
(let [local-state (worker-state conf id)]
- (.get local-state LS-WORKER-HEARTBEAT)
- ))
+ (try
+ (.get local-state LS-WORKER-HEARTBEAT)
+ (catch IOException e
+ (log-warn e "Failed to read local heartbeat for workerId : " id ",Ignoring exception.")
+ nil))))
(defn my-worker-ids [conf]
http://git-wip-us.apache.org/repos/asf/storm/blob/ca7bd99b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
index b40aa60..07ce5a8 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionedStore.java
@@ -94,13 +94,14 @@ public class VersionedStore {
public void deleteVersion(long version) throws IOException {
File versionFile = new File(versionPath(version));
File tokenFile = new File(tokenPath(version));
-
+
+ if(tokenFile.exists()) {
+ FileUtils.forceDelete(tokenFile);
+ }
+
if(versionFile.exists()) {
FileUtils.forceDelete(versionFile);
}
- if(tokenFile.exists()) {
- FileUtils.forceDelete(tokenFile);
- }
}
public void succeedVersion(String path) throws IOException {
[2/3] storm git commit: Merge branch 'STORM-682' of
https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-682
Posted by sr...@apache.org.
Merge branch 'STORM-682' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-682
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/012f75a8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/012f75a8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/012f75a8
Branch: refs/heads/master
Commit: 012f75a8c0e91371d8794bdf40bb58e439707d2f
Parents: 117256b ca7bd99
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 12 15:39:13 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 12 15:39:13 2015 -0700
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 7 +++++--
storm-core/src/jvm/backtype/storm/utils/VersionedStore.java | 9 +++++----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/012f75a8/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-682 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-682 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/73a7f5d7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/73a7f5d7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/73a7f5d7
Branch: refs/heads/master
Commit: 73a7f5d7306b0df8921130d23db22a5dca89fdbb
Parents: 012f75a
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Thu Mar 12 15:53:28 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Thu Mar 12 15:53:28 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/73a7f5d7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index afda343..aa2fdc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-682: supervisor should handle worker state corruption gracefully.
* STORM-446: Allow superusers to impersonate other users in secure mode.
* STORM-659: return grep matches each on its own line.
* STORM-693: KafkaBolt exception handling improvement.