You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2015/10/11 20:32:57 UTC
ambari git commit: AMBARI-12923. Prevent accidental kill of program
group in Docker. (David M. Lyle via eyang)
Repository: ambari
Updated Branches:
refs/heads/trunk 8967ed9bc -> 1e49680b1
AMBARI-12923. Prevent accidental kill of program group in Docker.
(David M. Lyle via eyang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e49680b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e49680b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e49680b
Branch: refs/heads/trunk
Commit: 1e49680b14107f22e40c93ef2dd8f84167c899cc
Parents: 8967ed9
Author: Eric Yang <ey...@apache.org>
Authored: Sun Oct 11 11:31:04 2015 -0700
Committer: Eric Yang <ey...@apache.org>
Committed: Sun Oct 11 11:32:54 2015 -0700
----------------------------------------------------------------------
ambari-server/src/main/python/ambari-server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e49680b/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index 7e07497..6d7a01e 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -142,7 +142,7 @@ def stop(args):
if status:
try:
- os.killpg(os.getpgid(pid), signal.SIGKILL)
+ os.kill(pid, signal.SIGTERM)
except OSError, e:
print_info_msg("Unable to stop Ambari Server - " + str(e))
return