Repository: ambari Updated Branches: refs/heads/branch-2.4 d5624726d -> ba4493c66
AMBARI-16749: Auto-start services: Ambari agent should set auto_start_only to True when recovery_type is AUTO_START Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/723181ed Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/723181ed Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/723181ed Branch: refs/heads/branch-2.4 Commit: 723181ed6dc4386eeae58243c6a3f5c6fc3204e9 Parents: d562472 Author: Nahappan Somasundaram <nsomasunda...@hortonworks.com> Authored: Wed May 18 14:43:21 2016 -0700 Committer: Nahappan Somasundaram <nsomasunda...@hortonworks.com> Committed: Tue May 24 11:35:30 2016 -0700 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/RecoveryManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/723181ed/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py index 9cce7f3..87d9483 100644 --- a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py +++ b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py @@ -546,7 +546,7 @@ class RecoveryManager: """ recovery_enabled = False - auto_start_only = True + auto_start_only = False max_count = 6 window_in_min = 60 retry_gap = 5 @@ -561,8 +561,8 @@ class RecoveryManager: if "type" in config: if config["type"] in ["AUTO_START", "FULL"]: recovery_enabled = True - if config["type"] == "FULL": - auto_start_only = False + if config["type"] == "AUTO_START": + auto_start_only = True if "maxCount" in config: max_count = self._read_int_(config["maxCount"], max_count) if "windowInMinutes" in config:
