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 42937200B27 for ; Wed, 22 Jun 2016 09:07:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 40C7F160A35; Wed, 22 Jun 2016 07:07:21 +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 8A4C0160A2E for ; Wed, 22 Jun 2016 09:07:20 +0200 (CEST) Received: (qmail 51928 invoked by uid 500); 22 Jun 2016 07:07:19 -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 51919 invoked by uid 99); 22 Jun 2016 07:07:19 -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; Wed, 22 Jun 2016 07:07:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 358ACDFEDA; Wed, 22 Jun 2016 07:07:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dsen@apache.org To: commits@ambari.apache.org Message-Id: <5f5a847d2b534b96a0b520ccd5c0300d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17342 Ambari agent log contains failures for AMS status commands (dsen) Date: Wed, 22 Jun 2016 07:07:19 +0000 (UTC) archived-at: Wed, 22 Jun 2016 07:07:21 -0000 Repository: ambari Updated Branches: refs/heads/trunk 13fc644c6 -> b3370d967 AMBARI-17342 Ambari agent log contains failures for AMS status commands (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3370d96 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3370d96 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3370d96 Branch: refs/heads/trunk Commit: b3370d96735b2e7691399af34e383dd10c143663 Parents: 13fc644 Author: Dmytro Sen Authored: Wed Jun 22 10:07:05 2016 +0300 Committer: Dmytro Sen Committed: Wed Jun 22 10:07:05 2016 +0300 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py | 5 +++++ .../stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py | 1 + 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b3370d96/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py index 825a48e..9d5aeaa 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py @@ -95,6 +95,11 @@ class AmsCollectorDefault(AmsCollector): security_params = get_params_from_filesystem(status_params.ams_hbase_conf_dir, {'hbase-site.xml': FILE_TYPE_XML}) + # In case of blueprint deployment security_status might be called before AMS collector is installed. + if ('hbase-site' not in security_params or 'hbase.cluster.distributed' not in security_params['hbase-site']) : + self.put_structured_out({"securityState": "UNKNOWN"}) + return + is_hbase_distributed = security_params['hbase-site']['hbase.cluster.distributed'] # for embedded mode, when HBase is backed by file, security state is SECURED_KERBEROS by definition when cluster is secured if status_params.security_enabled and not is_hbase_distributed: http://git-wip-us.apache.org/repos/asf/ambari/blob/b3370d96/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py index 195d388..37e6ee1 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py +++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py @@ -374,6 +374,7 @@ class TestMetricsCollector(RMFTestCase): owner = 'ams', action = ['delete'] ) + self.assertResourceCalled('File', '/etc/ams-hbase/conf/log4j.properties', owner = 'ams', group = 'hadoop',