ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [13/41] ambari git commit: AMBARI-20579. Ambari-server failed to stop (aonishuk)
Date Thu, 06 Apr 2017 09:33:34 GMT
AMBARI-20579. Ambari-server failed to stop (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/314e41eb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/314e41eb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/314e41eb

Branch: refs/heads/branch-3.0-perf
Commit: 314e41ebe06b70c4bf99eb70f383f81d6e5e2ea2
Parents: d972592
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Apr 3 17:33:11 2017 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Apr 6 12:32:56 2017 +0300

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari-server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/314e41eb/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 c985d65..87cc6c2 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -175,10 +175,10 @@ def stop(args):
     logger.info("Waiting for server stop...")
 
     if not wait_for_server_to_stop(SERVER_STOP_TIMEOUT):
-      err = "Ambari-server failed to stop"
+      err = "Ambari-server failed to stop gracefully. Sending SIGKILL to it"
       print err
       logger.error(err)
-      raise FatalException(1, err)
+      os.kill(pid, signal.SIGKILL)
 
     pid_file_path = os.path.join(configDefaults.PID_DIR, PID_NAME)
     os.remove(pid_file_path)


Mime
View raw message