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:54:15 UTC
[1/2] storm git commit: Merge branch 'STORM-977' of
https://github.com/gliptak/storm
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 28d7e69d5 -> 02d9b836b
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/1c590e16
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c590e16
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c590e16
Branch: refs/heads/0.10.x-branch
Commit: 1c590e1667d1f3d6ff89c4368441dfe322a640e0
Parents: 28d7e69
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:50:04 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/1c590e16/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 2b19596..87a2d3f 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.")
[2/2] storm git commit: Update 0.10.x-branch RM and CL for STORM-977
Posted by da...@apache.org.
Update 0.10.x-branch RM and CL 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/02d9b836
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/02d9b836
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/02d9b836
Branch: refs/heads/0.10.x-branch
Commit: 02d9b836bf63b92acff23664f8d8711cf65d282e
Parents: 1c590e1
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Aug 13 11:52:03 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Aug 13 11:52:03 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/02d9b836/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a92f99..e6b46f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0-beta2
+ * STORM-977: Incorrect signal (-9) when as-user is true
* STORM-843: [storm-redis] Add Javadoc to storm-redis
* STORM-866: Use storm.log.dir instead of storm.home in log4j2 config
* STORM-810: PartitionManager in storm-kafka should commit latest offset before close
http://git-wip-us.apache.org/repos/asf/storm/blob/02d9b836/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 1fd1f01..17d8b20 100644
--- a/README.markdown
+++ b/README.markdown
@@ -199,6 +199,7 @@ under the License.
* Zhuo Liu ([@zhuoliu](https://github.com/zhuoliu))
* jangie ([@jangie](https://github.com/jangie))
* Hailei Zhang ([@Hailei](https://github.com/Hailei))
+* Gabor Liptak ([@gliptak](https://github.com/glibtak))
## Acknowledgements