Repository: ambari Updated Branches: refs/heads/trunk dde5bb330 -> 541d15b21
AMBARI-4889. Storm components cannot be started after failure (Iryna Kuzmenko via aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/541d15b2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/541d15b2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/541d15b2 Branch: refs/heads/trunk Commit: 541d15b2125212e07dd5a7468fdf58ecee3c97fd Parents: dde5bb3 Author: Andrew Onischuk <[email protected]> Authored: Fri Feb 28 09:26:15 2014 -0800 Committer: Andrew Onischuk <[email protected]> Committed: Fri Feb 28 09:29:40 2014 -0800 ---------------------------------------------------------------------- .../stacks/HDP/2.1.1/services/STORM/package/scripts/service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/541d15b2/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py index a77ebff..9aac08b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/service.py @@ -31,7 +31,7 @@ def service( import status_params pid_file = status_params.pid_files[name] - no_op_test = format("ls {pid_file} >/dev/null 2>&1 && test ! -z \"`cat {pid_file}`\" && ps `cat {pid_file}` >/dev/null 2>&1") + no_op_test = format("ls {pid_file} >/dev/null 2>&1 && ps `cat {pid_file}` >/dev/null 2>&1") if name == 'ui': process_cmd = "^java.+backtype.storm.ui.core$" @@ -40,7 +40,7 @@ def service( else: process_cmd = format("^java.+backtype.storm.daemon.{name}$") - crt_pid_cmd = format("pgrep -f \"{process_cmd}\" > {pid_file}") + crt_pid_cmd = format("pgrep -f \"{process_cmd}\" && pgrep -f \"{process_cmd}\" > {pid_file}") if action == "start": if name == "rest_api":
