Repository: ambari Updated Branches: refs/heads/branch-2.1 0bad2efd4 -> 5454e3541 refs/heads/trunk ecb2b05e0 -> 0e6fc2409
AMBARI-11636. Flume log directory hard coded to /var/log/flume (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e6fc240 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e6fc240 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e6fc240 Branch: refs/heads/trunk Commit: 0e6fc2409253df89eb2eb5fa581094a4a7db1959 Parents: ecb2b05 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Jun 8 17:59:13 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Jun 8 17:59:13 2015 +0300 ---------------------------------------------------------------------- .../common-services/FLUME/1.4.0.2.0/package/scripts/params.py | 2 +- ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 3 ++- ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json | 3 ++- .../src/test/python/stacks/2.0.6/configs/flume_target.json | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py index 45902de..41a1b67 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py @@ -56,7 +56,7 @@ if Script.is_hdp_stack_greater_or_equal("2.2"): flume_hcat_home = '/usr/hdp/current/hive-webhcat' java_home = config['hostLevelParams']['java_home'] -flume_log_dir = '/var/log/flume' +flume_log_dir = config['configurations']['flume-env']['flume_log_dir'] flume_run_dir = '/var/run/flume' ambari_state_file = format("{flume_run_dir}/ambari-state.txt") http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 2c09011..910885c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -585,7 +585,8 @@ }, "flume-env": { "content": "export JAVA_HOME={{java64_home}}\nexport HIVE_HOME={{flume_hive_home}}", - "flume_user": "flume" + "flume_user": "flume", + "flume_log_dir": "/var/log/flume" }, "storm-env": { "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\"\"", http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json index 4c05aa3..5ef39f7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json @@ -512,7 +512,8 @@ }, "flume-env": { "content": "export JAVA_HOME={{java64_home}}\nexport HIVE_HOME={{flume_hive_home}}", - "flume_user": "flume" + "flume_user": "flume", + "flume_log_dir": "/var/log/flume" }, "storm-env": { "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\"\"", http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json index 4ef43ae..edea649 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json @@ -485,7 +485,8 @@ }, "flume-env": { "content": "export JAVA_HOME={{java64_home}}", - "flume_user": "flume" + "flume_user": "flume", + "flume_log_dir": "/var/log/flume" }, "tez-site": { "tez.am.log.level": "WARN",
