Repository: ambari Updated Branches: refs/heads/trunk a06b07d43 -> d49eeb6a2
AMBARI-9009. Flume start failed (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d49eeb6a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d49eeb6a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d49eeb6a Branch: refs/heads/trunk Commit: d49eeb6a291ba4dc1b7ee1cddaee346d053984b0 Parents: a06b07d Author: Lisnichenko Dmitro <[email protected]> Authored: Thu Jan 8 19:55:24 2015 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu Jan 8 19:55:24 2015 +0200 ---------------------------------------------------------------------- .../FLUME/1.4.0.2.0/package/scripts/flume.py | 13 ++++++++----- .../src/test/python/stacks/2.0.6/FLUME/test_flume.py | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d49eeb6a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py index f4870ad..3f30809 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py @@ -77,9 +77,8 @@ def flume(action = None): _set_desired_state('STARTED') # It is important to run this command as a background process. - - - flume_base = as_user(format("{flume_bin} agent --name {{0}} --conf {{1}} --conf-file {{2}} {{3}}"), params.flume_user, env={'JAVA_HOME': params.java_home}) + " &" + + flume_base = as_user(format("{flume_bin} agent --name {{0}} --conf {{1}} --conf-file {{2}} {{3}} > {flume_log_dir}/{{4}}.out 2>&1"), params.flume_user, env={'JAVA_HOME': params.java_home}) + " &" for agent in cmd_target_names(): flume_agent_conf_dir = params.flume_conf_dir + os.sep + agent @@ -99,7 +98,7 @@ def flume(action = None): extra_args = '-Dflume.monitoring.type=org.apache.hadoop.metrics2.sink.flume.FlumeTimelineMetricsSink' flume_cmd = flume_base.format(agent, flume_agent_conf_dir, - flume_agent_conf_file, extra_args) + flume_agent_conf_file, extra_args, agent) Execute(flume_cmd, wait_for_finish=False, @@ -107,8 +106,12 @@ 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=20, try_sleep=6) + Execute(pid_cmd, + logoutput=True, + tries=20, + try_sleep=10) pass elif action == 'stop': http://git-wip-us.apache.org/repos/asf/ambari/blob/d49eeb6a/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 af3910b..193eefb 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,14 +61,14 @@ class TestFlumeHandler(RMFTestCase): self.assertTrue(set_desired_mock.call_args[0][0] == 'STARTED') - self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export PATH=/bin JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/bin/flume-ng agent --name a1 --conf /etc/flume/conf/a1 --conf-file /etc/flume/conf/a1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655' &", + self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export PATH=/bin JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/bin/flume-ng agent --name a1 --conf /etc/flume/conf/a1 --conf-file /etc/flume/conf/a1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655 > /var/log/flume/a1.out 2>&1' &", environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, wait_for_finish = False, ) self.assertResourceCalled('Execute', 'pgrep -o -u flume -f ^/usr/jdk64/jdk1.7.0_45.*a1.* > /var/run/flume/a1.pid', logoutput = True, tries = 20, - try_sleep = 6) + try_sleep = 10) self.assertNoMoreResources() @@ -285,7 +285,7 @@ class TestFlumeHandler(RMFTestCase): self.assert_configure_many() - self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export PATH=/bin JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/bin/flume-ng agent --name b1 --conf /etc/flume/conf/b1 --conf-file /etc/flume/conf/b1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655' &", + self.assertResourceCalled('Execute', "/usr/bin/sudo su flume -l -s /bin/bash -c 'export PATH=/bin JAVA_HOME=/usr/jdk64/jdk1.7.0_45 ; /usr/bin/flume-ng agent --name b1 --conf /etc/flume/conf/b1 --conf-file /etc/flume/conf/b1/flume.conf -Dflume.monitoring.type=ganglia -Dflume.monitoring.hosts=c6401.ambari.apache.org:8655 > /var/log/flume/b1.out 2>&1' &", environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, wait_for_finish = False, ) @@ -293,7 +293,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 = 20, - try_sleep = 6) + try_sleep = 10) self.assertNoMoreResources()
