You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/08/13 18:36:39 UTC
[1/3] storm git commit: STORM-977 Send -15 (SIGTERM) signal to worker
Repository: storm
Updated Branches:
refs/heads/master 0ce410684 -> d7155d7be
STORM-977 Send -15 (SIGTERM) signal to worker
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e03bf633
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e03bf633
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e03bf633
Branch: refs/heads/master
Commit: e03bf633ef79ba4ee01436dd260b72263c3b1a7e
Parents: 544e55c
Author: Gábor Lipták <gl...@gmail.com>
Authored: Mon Aug 10 20:44:36 2015 -0400
Committer: Gábor Lipták <gl...@gmail.com>
Committed: Wed Aug 12 18:10:06 2015 -0400
----------------------------------------------------------------------
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/e03bf633/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 be8f682..f582761 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -262,7 +262,7 @@
(psim/kill-process thread-pid))
(doseq [pid pids]
(if as-user
- (worker-launcher-and-wait conf user ["signal" pid "9"] :log-prefix (str "kill -15 " pid))
+ (worker-launcher-and-wait conf user ["signal" pid "15"] :log-prefix (str "kill -15 " pid))
(kill-process-with-sig-term pid)))
(when-not (empty? pids)
(log-message "Sleep " shutdown-sleep-secs " seconds for execution of cleanup threads on worker.")
[3/3] storm git commit: Update CHANGELOG and Contributors for
STORM-977
Posted by da...@apache.org.
Update CHANGELOG and Contributors for STORM-977
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d7155d7b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d7155d7b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d7155d7b
Branch: refs/heads/master
Commit: d7155d7be58acc4bf77c4f4bee3188e411fc0f99
Parents: 237afcf
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Aug 13 11:34:42 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Aug 13 11:34:42 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d7155d7b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2045668..0f8edb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-977: Incorrect signal (-9) when as-user is true
* STORM-964: Add config (with small default value) for logwriter to restrict its memory usage
* STORM-980: Re-include storm-kafka tests from Travis CI build
* STORM-960: HiveBolt should ack tuples only after flushing.
http://git-wip-us.apache.org/repos/asf/storm/blob/d7155d7b/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index ac5dd48..a76673f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -212,6 +212,7 @@ under the License.
* Xingyu Su ([@errordaiwa](https://github.com/errordaiwa))
* Adrian Seungjin Lee ([@sweetest](https://github.com/sweetest))
* Randy Gelhausen ([@randerzander](https://github.com/randerzander))
+* Gabor Liptak ([@gliptak](https://github.com/glibtak))
## Acknowledgements
[2/3] storm git commit: Merge branch 'STORM-977' of
https://github.com/gliptak/storm
Posted by da...@apache.org.
Merge branch 'STORM-977' of https://github.com/gliptak/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/237afcfb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/237afcfb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/237afcfb
Branch: refs/heads/master
Commit: 237afcfbb1e17015e2271e71111b456a6d014f10
Parents: 0ce4106 e03bf63
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Aug 13 11:30:51 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Aug 13 11:30:51 2015 -0500
----------------------------------------------------------------------
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/237afcfb/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------