Repository: ambari Updated Branches: refs/heads/trunk dfa16136d -> d6d5df5c4
AMBARI-18505. Ambari Status commands should enforce a timeout < heartbeat interval (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6d5df5c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6d5df5c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6d5df5c Branch: refs/heads/trunk Commit: d6d5df5c47f28916fbeec1d019f07d615a4e8d4d Parents: dfa1613 Author: Andrew Onishuk <[email protected]> Authored: Mon Oct 3 12:39:28 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Oct 3 12:39:28 2016 +0300 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d6d5df5c/ambari-agent/src/main/python/ambari_agent/ActionQueue.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py index 86918e5..c03ee4f 100644 --- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py +++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py @@ -87,7 +87,7 @@ class ActionQueue(threading.Thread): self.tmpdir = config.get('agent', 'prefix') self.customServiceOrchestrator = CustomServiceOrchestrator(config, controller) self.parallel_execution = config.get_parallel_exec_option() - self.status_command_timeout = int(self.config.get('agent', 'status_command_timeout', 5)) + self.status_command_timeout = int(self.config.get('agent', 'status_command_timeout', 2)) if self.parallel_execution == 1: logger.info("Parallel execution is enabled, will execute agent commands in parallel")
