You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/11/25 14:59:09 UTC
[2/2] ambari git commit: AMBARI-14064. Sometimes Supervisor Stop is
failed when try to enable AD security (Upgrade from 2.1.1 to
2.1.3.0)[resource_management.core.exceptions.Fail] (aonishuk)
AMBARI-14064. Sometimes Supervisor Stop is failed when try to enable AD security (Upgrade from 2.1.1 to 2.1.3.0)[resource_management.core.exceptions.Fail] (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d566827d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d566827d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d566827d
Branch: refs/heads/branch-2.1
Commit: d566827d83e17110bb911f74a0c9a536886bc000
Parents: 61c8514
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Nov 25 15:59:04 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Nov 25 15:59:04 2015 +0200
----------------------------------------------------------------------
.../common-services/STORM/0.9.1.2.1/package/scripts/service.py | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d566827d/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
index 378bfd1..7437ddf 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
@@ -81,6 +81,10 @@ def service(name, action = 'start'):
if os.path.exists(pid_file):
pid = get_user_call_output.get_user_call_output(format("! test -f {pid_file} || cat {pid_file}"), user=params.storm_user)[1]
+ # if multiple processes are running (for example user can start logviewer from console)
+ # there can be more than one id
+ pid = pid.replace("\n", " ")
+
Execute(format("{sudo} kill {pid}"),
not_if = process_dont_exist)