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/9322283a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9322283a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9322283a Branch: refs/heads/1.x-branch Commit: 9322283a6c205697a50d1fadc3345e0af798d26b Parents: 28b96d7 Author: Alessandro Bellina <[email protected]> Authored: Tue Mar 15 10:07:25 2016 -0500 Committer: Alessandro Bellina <[email protected]> Committed: Tue Mar 15 10:07:25 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/9322283a/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 e79b94d..d34ddb1 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj @@ -1121,7 +1121,7 @@ (blob-rm-key blob-store (master-stormconf-key id) storm-cluster-state) (blob-rm-key blob-store (master-stormcode-key id) storm-cluster-state)) -(defn force-delete-dir [conf id] +(defn force-delete-topo-dist-dir [conf id] (rmr (master-stormdist-root conf id))) (defn do-cleanup [nimbus] @@ -1138,7 +1138,7 @@ (.teardown-heartbeats! storm-cluster-state id) (.teardown-topology-errors! storm-cluster-state id) (.remove-backpressure! 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/9322283a/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 0e6e4b6..0788fce 100644 --- a/storm-core/test/clj/org/apache/storm/nimbus_test.clj +++ b/storm-core/test/clj/org/apache/storm/nimbus_test.clj @@ -1581,7 +1581,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) @@ -1599,8 +1599,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) @@ -1628,7 +1628,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) @@ -1636,7 +1636,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
