Repository: ambari Updated Branches: refs/heads/trunk 6280aca95 -> bc5d7e07c
AMBARI-8063 Flume: /etc/flume/conf/flume-env.sh not being used when multiple agents on host (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc5d7e07 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc5d7e07 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc5d7e07 Branch: refs/heads/trunk Commit: bc5d7e07cc2b46acd648cddd8a6710153a1e8a6f Parents: 6280aca Author: Dmytro Sen <[email protected]> Authored: Fri Oct 31 14:04:28 2014 +0200 Committer: Dmytro Sen <[email protected]> Committed: Fri Oct 31 14:04:28 2014 +0200 ---------------------------------------------------------------------- .../services/FLUME/package/scripts/flume.py | 11 +++++---- .../python/stacks/2.0.6/FLUME/test_flume.py | 25 ++++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5d7e07/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 f2179f3..09e5413 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 @@ -35,11 +35,6 @@ def flume(action = None): Directory(params.flume_conf_dir, recursive=True) Directory(params.flume_log_dir, owner=params.flume_user) - File(format("{flume_conf_dir}/flume-env.sh"), - owner=params.flume_user, - content=InlineTemplate(params.flume_env_sh_template) - ) - flume_agents = {} if params.flume_conf_content is not None: flume_agents = build_flume_topology(params.flume_conf_content) @@ -49,6 +44,7 @@ def flume(action = None): flume_agent_conf_file = os.path.join(flume_agent_conf_dir, 'flume.conf') flume_agent_meta_file = os.path.join(flume_agent_conf_dir, 'ambari-meta.json') flume_agent_log4j_file = os.path.join(flume_agent_conf_dir, 'log4j.properties') + flume_agent_env_file = os.path.join(flume_agent_conf_dir, 'flume-env.sh') Directory(flume_agent_conf_dir) @@ -64,6 +60,11 @@ def flume(action = None): content = json.dumps(ambari_meta(agent, flume_agents[agent])), mode = 0644) + File(flume_agent_env_file, + owner=params.flume_user, + content=InlineTemplate(params.flume_env_sh_template) + ) + elif action == 'start': # desired state for service should be STARTED if len(params.flume_command_targets) == 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/bc5d7e07/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 7ed5828..93eede5 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 @@ -160,11 +160,6 @@ class TestFlumeHandler(RMFTestCase): self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume') - self.assertResourceCalled('File', "/etc/flume/conf/flume-env.sh", - owner="flume", - content=InlineTemplate(self.getConfig()['configurations']['flume-env']['content']) - ) - self.assertResourceCalled('Directory', '/etc/flume/conf/a1') self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/a1/flume.conf', @@ -182,17 +177,17 @@ class TestFlumeHandler(RMFTestCase): content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}', mode = 0644) + self.assertResourceCalled('File', "/etc/flume/conf/a1/flume-env.sh", + owner="flume", + content=InlineTemplate(self.getConfig()['configurations']['flume-env']['content']) + ) + def assert_configure_many(self): self.assertResourceCalled('Directory', '/etc/flume/conf', recursive=True) self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume') - self.assertResourceCalled('File', "/etc/flume/conf/flume-env.sh", - owner="flume", - content=InlineTemplate(self.getConfig()['configurations']['flume-env']['content']) - ) - top = build_flume(self.getConfig()['configurations']['flume-conf']['content']) # a1 @@ -209,6 +204,11 @@ class TestFlumeHandler(RMFTestCase): content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}', mode = 0644) + self.assertResourceCalled('File', "/etc/flume/conf/a1/flume-env.sh", + owner="flume", + content=InlineTemplate(self.getConfig()['configurations']['flume-env']['content']) + ) + # b1 self.assertResourceCalled('Directory', '/etc/flume/conf/b1') self.assertResourceCalled('PropertiesFile', '/etc/flume/conf/b1/flume.conf', @@ -222,6 +222,11 @@ class TestFlumeHandler(RMFTestCase): '/etc/flume/conf/b1/ambari-meta.json', content='{"channels_count": 1, "sinks_count": 1, "sources_count": 1}', mode = 0644) + self.assertResourceCalled('File', "/etc/flume/conf/b1/flume-env.sh", + owner="flume", + content=InlineTemplate(self.getConfig()['configurations']['flume-env']['content']) + ) + @patch("os.path.isfile") def test_start_single(self, os_path_isfile_mock):
