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 9799E200BD8 for ; Wed, 7 Dec 2016 12:28:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9632B160B0A; Wed, 7 Dec 2016 11:28:30 +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 B9620160AFD for ; Wed, 7 Dec 2016 12:28:29 +0100 (CET) Received: (qmail 80001 invoked by uid 500); 7 Dec 2016 11:28:28 -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 79992 invoked by uid 99); 7 Dec 2016 11:28:28 -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, 07 Dec 2016 11:28:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACD49E0159; Wed, 7 Dec 2016 11:28:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Message-Id: <6bf9bcd3370d4a48be3052bca75c4951@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19113. Add timeout for LogSearch and Infra Solr metainfo.xml (oleewere) Date: Wed, 7 Dec 2016 11:28:28 +0000 (UTC) archived-at: Wed, 07 Dec 2016 11:28:30 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 a0f0473e8 -> 12692074e AMBARI-19113. Add timeout for LogSearch and Infra Solr metainfo.xml (oleewere) Change-Id: I8cd2e50def25febcc6c8d08a7f8f04625c69c7be Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12692074 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12692074 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12692074 Branch: refs/heads/branch-2.5 Commit: 12692074e7261a8da738ba87c531ba4f3361dcaa Parents: a0f0473 Author: oleewere Authored: Wed Dec 7 12:20:45 2016 +0100 Committer: oleewere Committed: Wed Dec 7 12:20:45 2016 +0100 ---------------------------------------------------------------------- .../resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml | 1 + .../AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py | 3 ++- .../main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml | 1 + .../LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py | 3 ++- .../src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 2 +- .../src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml index 8e1051b..b94812b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/metainfo.xml @@ -34,6 +34,7 @@ PYTHON + 1800 http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py index 41cb504..5143cbb 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/setup_infra_solr.py @@ -112,4 +112,5 @@ def create_ambari_solr_znode(): solr_cloud_util.create_znode( zookeeper_quorum=params.zookeeper_quorum, solr_znode=params.infra_solr_znode, - java64_home=params.java64_home) \ No newline at end of file + java64_home=params.java64_home, + retry=30, interval=5) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml index f69bd3c..ed74bdf 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/metainfo.xml @@ -36,6 +36,7 @@ PYTHON + 1800 http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py index 6c1a936..351126b 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py @@ -136,4 +136,5 @@ def check_znode(): solr_cloud_util.check_znode( zookeeper_quorum=params.zookeeper_quorum, solr_znode=params.infra_solr_znode, - java64_home=params.java64_home) + java64_home=params.java64_home, + retry=30, interval=5) http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py index 005283f..6af463c 100644 --- a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py +++ b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py @@ -95,7 +95,7 @@ class TestInfraSolr(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['infra-solr-log4j']['content']) ) - self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --create-znode --retry 5 --interval 10') + self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --create-znode --retry 30 --interval 5') self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --cluster-prop --property-name urlScheme --property-value http') self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --setup-kerberos-plugin') http://git-wip-us.apache.org/repos/asf/ambari/blob/12692074/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py index 6b4fab8..df54cd8 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py @@ -129,7 +129,7 @@ class TestLogSearch(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['content']) ) - self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --check-znode --retry 5 --interval 10') + self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --check-znode --retry 30 --interval 5') self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --download-config --config-dir /tmp/solr_config_hadoop_logs_0.[0-9]* --config-set hadoop_logs --retry 30 --interval 5') self.assertResourceCalledRegexp('^File$', '^/tmp/solr_config_hadoop_logs_0.[0-9]*', content=InlineTemplate(self.getConfig()['configurations']['logsearch-service_logs-solrconfig']['content']),