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/02/23 17:39:14 UTC
[3/6] storm git commit: STORM-130: Supervisor getting killed due to
java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8d5ac19a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8d5ac19a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8d5ac19a
Branch: refs/heads/master
Commit: 8d5ac19aceac9cf1bbee0a2cef20ee67d570085b
Parents: eaedc83
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Thu Jan 29 22:33:01 2015 -0800
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Thu Jan 29 22:33:01 2015 -0800
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8d5ac19a/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 fde53c4..e794710 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -358,12 +358,13 @@
(let [downloaded-storm-ids (set (read-downloaded-storm-ids conf))
storm-id (:storm-id assignment)
cached-assignment-info @(:assignment-versions supervisor)
- assignment-info (if (nil? cached-assignment-info) (.assignment-info-with-version storm-cluster-state storm-id nil)
- (get cached-assignment-info storm-id))
- storm-code-map (read-storm-code-locations assignment-info)
+ assignment-info (if (and (not-nil? cached-assignment-info) (contains? cached-assignment-info storm-id ))
+ (get cached-assignment-info storm-id)
+ (.assignment-info-with-version storm-cluster-state storm-id nil))
+ storm-code-map (read-storm-code-locations assignment-info)
master-code-dir (if (contains? storm-code-map :data) (storm-code-map :data))
stormroot (supervisor-stormdist-root conf storm-id)]
- (if-not (or (downloaded-storm-ids storm-id) (.exists (File. stormroot)))
+ (if-not (or (contains? downloaded-storm-ids storm-id) (.exists (File. stormroot)) (nil? master-code-dir))
(download-storm-code conf storm-id master-code-dir download-lock))
))