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 2014/07/11 23:18:19 UTC
[5/9] git commit: Cleanup for pull
Cleanup for pull
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6d560cb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6d560cb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6d560cb6
Branch: refs/heads/master
Commit: 6d560cb6b7c1b120f30d026a50042c768ab90692
Parents: 310e09e
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Fri Jun 27 18:29:03 2014 +0000
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Fri Jun 27 18:29:03 2014 +0000
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/cluster.clj | 2 +-
storm-core/src/clj/backtype/storm/daemon/worker.clj | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6d560cb6/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 c5e6f16..8ff5a2c 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -58,6 +58,7 @@
(callback type path))))))]
(reify
ClusterState
+
(register
[this callback]
(let [id (uuid)]
@@ -122,7 +123,6 @@
(reset! active false)
(.close zk)))))
-
(defprotocol StormClusterState
(assignments [this callback])
(assignment-info [this storm-id callback])
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6d560cb6/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index 0ec9bda..8ad72d7 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -245,8 +245,6 @@
[node (Integer/valueOf port-str)]
))
-(def assignment-versions (atom {}))
-
(defn mk-refresh-connections [worker]
(let [outbound-tasks (worker-outbound-tasks worker)
conf (:conf worker)
@@ -256,15 +254,10 @@
([]
(this (fn [& ignored] (schedule (:refresh-connections-timer worker) 0 this))))
([callback]
- (log-message "Refreshing Assignments")
(let [version (.assignment-version storm-cluster-state storm-id callback)
-; _ (log-message (str "Assignments are: " @assignment-versions))
assignment (if (= version (:version (get @assignment-versions storm-id)))
- (do
- (log-message "Keeping old Assignments.")
- (:data (get @assignment-versions storm-id)))
+ (:data (get @assignment-versions storm-id))
(let [new-assignment (.assignment-info-with-version storm-cluster-state storm-id callback)]
- (log-message "Getting new Assignments.")
(swap! assignment-versions assoc storm-id new-assignment)
(:data new-assignment)))
my-assignment (-> assignment