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/11/05 22:11:53 UTC
[1/4] storm git commit: [STORM-1163] using rmr rather than rmpath for
remove worker-root
Repository: storm
Updated Branches:
refs/heads/master 2bad9c62e -> 8545ff9a6
[STORM-1163] using rmr rather than rmpath for remove worker-root
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8d6ab39a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8d6ab39a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8d6ab39a
Branch: refs/heads/master
Commit: 8d6ab39ac7d6625254c9dedd217b9d0ce63531fe
Parents: f3568d7
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Nov 4 10:47:19 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Nov 4 10:47:19 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8d6ab39a/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 52b2057..ccca370 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -244,7 +244,7 @@
(rmr (worker-heartbeats-root conf id))
;; this avoids a race condition with worker or subprocess writing pid around same time
(rmpath (worker-pids-root conf id))
- (rmpath (worker-root conf id))))
+ (rmr (worker-root conf id))))
(remove-worker-user! conf id)
(remove-dead-worker id)
))
[3/4] storm git commit: Merge branch '1163' of
https://github.com/zhuoliu/storm into STORM-1163
Posted by bo...@apache.org.
Merge branch '1163' of https://github.com/zhuoliu/storm into STORM-1163
STORM-1163: use rmr rather than rmpath for remove worker-root
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2575b491
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2575b491
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2575b491
Branch: refs/heads/master
Commit: 2575b491087d51268e014b28518cbec66aac0239
Parents: 2bad9c6 686e906
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Nov 5 15:01:15 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Nov 5 15:01:15 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2575b491/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
[2/4] storm git commit: use rmr also for worker/pids
Posted by bo...@apache.org.
use rmr also for worker/pids
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/686e9061
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/686e9061
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/686e9061
Branch: refs/heads/master
Commit: 686e9061fbe921fed23b81b02faeb5965556b6b8
Parents: 8d6ab39
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Nov 4 11:11:08 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Nov 4 11:11:08 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/686e9061/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 ccca370..bbda85e 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -243,7 +243,7 @@
(do
(rmr (worker-heartbeats-root conf id))
;; this avoids a race condition with worker or subprocess writing pid around same time
- (rmpath (worker-pids-root conf id))
+ (rmr (worker-pids-root conf id))
(rmr (worker-root conf id))))
(remove-worker-user! conf id)
(remove-dead-worker id)
[4/4] storm git commit: added STORM-1163 to Changelog
Posted by bo...@apache.org.
added STORM-1163 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8545ff9a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8545ff9a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8545ff9a
Branch: refs/heads/master
Commit: 8545ff9a638c8e5be3322243b8e5b6a2f853605e
Parents: 2575b49
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Nov 5 15:02:37 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Nov 5 15:02:37 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8545ff9a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c47ab20..9813590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1163: use rmr rather than rmpath for remove worker-root
* STORM-1170: Fix the producer alive issue in DisruptorQueueTest
* STORM-1168: removes noisy log message & a TODO
* STORM-1143: Validate topology Configs during topology submission