Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9028A17445 for ; Fri, 31 Oct 2014 03:46:42 +0000 (UTC) Received: (qmail 37278 invoked by uid 500); 31 Oct 2014 03:46:42 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 37239 invoked by uid 500); 31 Oct 2014 03:46:42 -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 37230 invoked by uid 99); 31 Oct 2014 03:46:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 03:46:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CF7F0A05C51; Fri, 31 Oct 2014 03:46:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alejandro@apache.org To: commits@ambari.apache.org Message-Id: <2b44b961c6814885a88e204ecf392030@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-8059. Flume Start is failing with pid returned 1 (alejandro) Date: Fri, 31 Oct 2014 03:46:41 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 3f6589dcd -> 6280aca95 AMBARI-8059. Flume Start is failing with pid returned 1 (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6280aca9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6280aca9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6280aca9 Branch: refs/heads/trunk Commit: 6280aca95e0b7402af06aa1b2f3a7cf463a66b8f Parents: 3f6589d Author: Alejandro Fernandez Authored: Thu Oct 30 20:46:10 2014 -0700 Committer: Alejandro Fernandez Committed: Thu Oct 30 20:46:10 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py | 2 +- ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6280aca9/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py index 51654a0..f2179f3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume.py @@ -94,7 +94,7 @@ def flume(action = None): # sometimes startup spawns a couple of threads - so only the first line may count pid_cmd = format('pgrep -o -u {flume_user} -f ^{java_home}.*{agent}.* > {flume_agent_pid_file}') - Execute(pid_cmd, logoutput=True, tries=10, try_sleep=6) + Execute(pid_cmd, logoutput=True, tries=20, try_sleep=6) pass elif action == 'stop': http://git-wip-us.apache.org/repos/asf/ambari/blob/6280aca9/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py index 0b19812..7ed5828 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py @@ -61,7 +61,7 @@ class TestFlumeHandler(RMFTestCase): self.assertResourceCalled('Execute', 'pgrep -o -u flume -f ^/usr/jdk64/jdk1.7.0_45.*a1.* > /var/run/flume/a1.pid', logoutput = True, - tries = 10, + tries = 20, try_sleep = 6) self.assertNoMoreResources() @@ -274,7 +274,7 @@ class TestFlumeHandler(RMFTestCase): self.assertResourceCalled('Execute', 'pgrep -o -u flume -f ^/usr/jdk64/jdk1.7.0_45.*b1.* > /var/run/flume/b1.pid', logoutput = True, - tries = 10, + tries = 20, try_sleep = 6) self.assertNoMoreResources()