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/04/08 22:51:58 UTC
[1/3] storm git commit: Fix for STORM-694
Repository: storm
Updated Branches:
refs/heads/master a6935d4be -> e9ac047b0
Fix for STORM-694
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0af1d08c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0af1d08c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0af1d08c
Branch: refs/heads/master
Commit: 0af1d08c690b1bed68669e4fd291a7c186ea185c
Parents: 36e99fa
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Mar 30 12:24:13 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Mar 30 12:24:13 2015 -0500
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/supervisor.clj | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0af1d08c/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 bc8b999..d9aaaa3 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -18,7 +18,6 @@
(:import [backtype.storm.scheduler ISupervisor]
[backtype.storm.utils LocalState Time Utils]
[backtype.storm.daemon Shutdownable]
- [backtype.storm.daemon.common SupervisorInfo]
[backtype.storm Constants]
[java.net JarURLConnection]
[java.net URI]
@@ -506,14 +505,14 @@
heartbeat-fn (fn [] (.supervisor-heartbeat!
(:storm-cluster-state supervisor)
(:supervisor-id supervisor)
- (SupervisorInfo. (current-time-secs)
- (:my-hostname supervisor)
- (:assignment-id supervisor)
- (keys @(:curr-assignment supervisor))
- ;; used ports
- (.getMetadata isupervisor)
- (conf SUPERVISOR-SCHEDULER-META)
- ((:uptime supervisor)))))]
+ (->SupervisorInfo (current-time-secs)
+ (:my-hostname supervisor)
+ (:assignment-id supervisor)
+ (keys @(:curr-assignment supervisor))
+ ;; used ports
+ (.getMetadata isupervisor)
+ (conf SUPERVISOR-SCHEDULER-META)
+ ((:uptime supervisor)))))]
(heartbeat-fn)
;; should synchronize supervisor so it doesn't launch anything after being down (optimization)
(schedule-recurring (:heartbeat-timer supervisor)
[2/3] storm git commit: Merge branch 'STORM-694' of
https://github.com/knusbaum/incubator-storm into STORM-694
Posted by sr...@apache.org.
Merge branch 'STORM-694' of https://github.com/knusbaum/incubator-storm into STORM-694
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1fbaeada
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1fbaeada
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1fbaeada
Branch: refs/heads/master
Commit: 1fbaeada6e7eb337bc7d7802c71198d417a8b1d3
Parents: a6935d4 0af1d08
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed Apr 8 13:44:10 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed Apr 8 13:44:10 2015 -0700
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/supervisor.clj | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-694 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-694 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e9ac047b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e9ac047b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e9ac047b
Branch: refs/heads/master
Commit: e9ac047b0adea339e005aedf13c969474d27edcc
Parents: 1fbaead
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed Apr 8 13:44:55 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed Apr 8 13:44:55 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e9ac047b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d0a846..d0e8aad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-694: java.lang.ClassNotFoundException: backtype.storm.daemon.common.SupervisorInfo
* STORM-750: Set Config serialVersionUID
* STORM-713: Include topic information with Kafka metrics.
* STORM-708: CORS support for STORM UI.