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 2016/03/22 20:57:45 UTC
[3/4] storm git commit: STORM-1614: force-delete-dir ->
force-delete-topo-dist-dir
STORM-1614: force-delete-dir -> force-delete-topo-dist-dir
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/092ea1df
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/092ea1df
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/092ea1df
Branch: refs/heads/master
Commit: 092ea1df87ee7481e43ab18b421a31370dc3986d
Parents: 44050a7
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Tue Mar 15 10:01:56 2016 -0500
Committer: Alessandro Bellina <ab...@yahoo-inc.com>
Committed: Tue Mar 15 10:01:56 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
storm-core/test/clj/org/apache/storm/nimbus_test.clj | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/092ea1df/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index b91b85d..da4a205 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -1142,7 +1142,7 @@
(blob-rm-key blob-store (ConfigUtils/masterStormConfKey id) storm-cluster-state)
(blob-rm-key blob-store (ConfigUtils/masterStormCodeKey id) storm-cluster-state))
-(defn force-delete-dir [conf id]
+(defn force-delete-topo-dist-dir [conf id]
(Utils/forceDelete (ConfigUtils/masterStormDistRoot conf id)))
(defn do-cleanup [nimbus]
@@ -1159,7 +1159,7 @@
(.teardownHeartbeats storm-cluster-state id)
(.teardownTopologyErrors storm-cluster-state id)
(.removeBackpressure storm-cluster-state id)
- (force-delete-dir conf id)
+ (force-delete-topo-dist-dir conf id)
(blob-rm-topology-keys id blob-store storm-cluster-state)
(swap! (:heartbeats-cache nimbus) dissoc id)))))
(log-message "not a leader, skipping cleanup")))
http://git-wip-us.apache.org/repos/asf/storm/blob/092ea1df/storm-core/test/clj/org/apache/storm/nimbus_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/nimbus_test.clj b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
index c3ca229..2388879 100644
--- a/storm-core/test/clj/org/apache/storm/nimbus_test.clj
+++ b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
@@ -1731,7 +1731,7 @@
[teardown-heartbeats
teardown-topo-errors
teardown-backpressure-dirs
- nimbus/force-delete-dir
+ nimbus/force-delete-topo-dist-dir
nimbus/blob-rm-topology-keys]
(nimbus/do-cleanup nimbus)
@@ -1749,8 +1749,8 @@
(verify-nth-call-args-for 2 teardown-backpressure-dirs "topo3")
;; removed topo directories
- (verify-nth-call-args-for 1 nimbus/force-delete-dir conf "topo2")
- (verify-nth-call-args-for 2 nimbus/force-delete-dir conf "topo3")
+ (verify-nth-call-args-for 1 nimbus/force-delete-topo-dist-dir conf "topo2")
+ (verify-nth-call-args-for 2 nimbus/force-delete-topo-dist-dir conf "topo3")
;; removed blob store topo keys
(verify-nth-call-args-for 1 nimbus/blob-rm-topology-keys "topo2" mock-blob-store mock-state)
@@ -1778,7 +1778,7 @@
[teardown-heartbeats
teardown-topo-errors
teardown-backpressure-dirs
- nimbus/force-delete-dir
+ nimbus/force-delete-topo-dist-dir
nimbus/blob-rm-topology-keys]
(nimbus/do-cleanup nimbus)
@@ -1786,7 +1786,7 @@
(verify-call-times-for teardown-heartbeats 0)
(verify-call-times-for teardown-topo-errors 0)
(verify-call-times-for teardown-backpressure-dirs 0)
- (verify-call-times-for nimbus/force-delete-dir 0)
+ (verify-call-times-for nimbus/force-delete-topo-dist-dir 0)
(verify-call-times-for nimbus/blob-rm-topology-keys 0)
;; hb-cache goes down to 1 because only one topo was inactive