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/10/05 21:22:30 UTC
[6/9] storm git commit: Clearing logconfig zk node for topology as
part of remove-storm
Clearing logconfig zk node for topology as part of remove-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/754017f1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/754017f1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/754017f1
Branch: refs/heads/master
Commit: 754017f1c16bc74797a39c2cbb64e8c5e50f3010
Parents: 51c3253
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Sep 30 07:50:44 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Sep 30 07:50:44 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/cluster.clj | 9 +--------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 1 -
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/754017f1/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 77c576f..e471e53 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -177,7 +177,6 @@
(setup-heartbeats! [this storm-id])
(teardown-heartbeats! [this storm-id])
(teardown-topology-errors! [this storm-id])
- (teardown-topology-log-config! [this storm-id])
(heartbeat-storms [this])
(error-topologies [this])
(set-topology-log-config! [this storm-id log-config])
@@ -540,13 +539,6 @@
(catch KeeperException e
(log-warn-error e "Could not teardown errors for " storm-id))))
- (teardown-topology-log-config!
- [this storm-id]
- (try-cause
- (.delete_node cluster-state (log-config-path storm-id))
- (catch KeeperException e
- (log-warn-error e "Could not teardown log configs for " storm-id))))
-
(supervisor-heartbeat!
[this supervisor-id info]
(let [thrift-supervisor-info (thriftify-supervisor-info info)]
@@ -599,6 +591,7 @@
(delete-node cluster-state (assignment-path storm-id))
(delete-node cluster-state (code-distributor-path storm-id))
(delete-node cluster-state (credentials-path storm-id))
+ (delete-node cluster-state (log-config-path storm-id))
(remove-storm-base! this storm-id))
(set-credentials!
http://git-wip-us.apache.org/repos/asf/storm/blob/754017f1/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index c797c4b..19870f1 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -931,7 +931,6 @@
(if (:code-distributor nimbus) (.cleanup (:code-distributor nimbus) id))
(.teardown-heartbeats! storm-cluster-state id)
(.teardown-topology-errors! storm-cluster-state id)
- (.teardown-topology-log-config! storm-cluster-state id)
(rmr (master-stormdist-root conf id))
(swap! (:heartbeats-cache nimbus) dissoc id))
)))