Repository: ambari Updated Branches: refs/heads/branch-1.7.0 626bf2a19 -> eedf1e0e1
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/eedf1e0e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eedf1e0e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eedf1e0e Branch: refs/heads/branch-1.7.0 Commit: eedf1e0e1acf26438df5922a67febbb70cbc3a57 Parents: 626bf2a Author: Alejandro Fernandez <[email protected]> Authored: Thu Oct 30 20:41:09 2014 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Oct 30 20:41:09 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/eedf1e0e/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 2db4039..ab3d2c4 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 @@ -92,7 +92,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/eedf1e0e/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 85602ef..86d1fd0 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()
