Repository: ambari Updated Branches: refs/heads/branch-2.1 74eb8d1de -> 81d5ccf01 refs/heads/branch-2.1.2 38f6b0438 -> f3bbecabb refs/heads/trunk 8e06ea681 -> 7e45cd3ef
AMBARI-13627. Security can not be enabled on cluster with MOTD for "su" (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e45cd3e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e45cd3e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e45cd3e Branch: refs/heads/trunk Commit: 7e45cd3ef9e2691bb68f3ef12d7fedd1cbdf6ed4 Parents: 8e06ea6 Author: Andrew Onishuk <[email protected]> Authored: Fri Oct 30 15:26:01 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Fri Oct 30 15:26:01 2015 +0200 ---------------------------------------------------------------------- .../common-services/STORM/0.9.1.2.1/package/scripts/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e45cd3e/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 3210d8a..256d7cd 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 @@ -76,7 +76,7 @@ def service(name, action = 'start'): elif action == "stop": process_dont_exist = format("! ({no_op_test})") - pid = get_user_call_output.get_user_call_output(format("cat {pid_file}"), user=params.storm_user)[1] + pid = get_user_call_output.get_user_call_output(format("! test -f {pid_file} || cat {pid_file}"), user=params.storm_user)[1] Execute(format("{sudo} kill {pid}"), not_if = process_dont_exist)
