AMBARI-18369. Make Execute timeout to be able to kill process trees which doesn't respond to SIGTERM (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f90b55a8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f90b55a8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f90b55a8 Branch: refs/heads/branch-dev-patch-upgrade Commit: f90b55a8bde1baa6cf2321d63596f3b8329292d9 Parents: e54c31e Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Tue Sep 20 10:43:45 2016 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Tue Sep 20 10:49:13 2016 +0300 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f90b55a8/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py index cd1eded..0873730 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py @@ -196,7 +196,7 @@ def execute(configurations={}, parameters={}, host_name=None): try: Execute(cmd, user=smokeuser, path=["/bin/", "/usr/bin/", "/usr/sbin/", bin_dir], - timeout=5, + timeout=int(check_command_timeout), timeout_kill_strategy=TerminateStrategy.KILL_PROCESS_TREE, )
