Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2684B200B31 for ; Tue, 24 May 2016 20:37:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2535D160A38; Tue, 24 May 2016 18:37:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 6A8FB16098E for ; Tue, 24 May 2016 20:37:35 +0200 (CEST) Received: (qmail 81952 invoked by uid 500); 24 May 2016 18:37:34 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 81943 invoked by uid 99); 24 May 2016 18:37:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2016 18:37:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83CD9DFDD0; Tue, 24 May 2016 18:37:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smnaha@apache.org To: commits@ambari.apache.org Date: Tue, 24 May 2016 18:37:34 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] ambari git commit: AMBARI-16749: Auto-start services: Ambari agent should set auto_start_only to True when recovery_type is AUTO_START archived-at: Tue, 24 May 2016 18:37:36 -0000 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 Authored: Wed May 18 14:43:21 2016 -0700 Committer: Nahappan Somasundaram 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: