You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/05/19 14:24:36 UTC
ambari git commit: AMBARI-16749: Auto-start services: Ambari agent
should set auto_start_only to True when recovery_type is AUTO_START
Repository: ambari
Updated Branches:
refs/heads/trunk 9d5f1b400 -> 6a03b3381
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/6a03b338
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a03b338
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a03b338
Branch: refs/heads/trunk
Commit: 6a03b338143857eb5c7325c070315c59ab513794
Parents: 9d5f1b4
Author: Nahappan Somasundaram <ns...@hortonworks.com>
Authored: Wed May 18 14:43:21 2016 -0700
Committer: Nahappan Somasundaram <ns...@hortonworks.com>
Committed: Thu May 19 07:24:25 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/6a03b338/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: