[04/39] git commit: AMBARI-7197. Add rca properties to log4j.properties from Download Configs. (aonishuk)
AMBARI-7197. Add rca properties to log4j.properties from Download Configs. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c8299b1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c8299b1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c8299b1 Branch: refs/heads/branch-alerts-dev Commit: 7c8299b1c5f1885af8da1fa68a75d89d0a07a601 Parents: 8b26d8b Author: Andrew Onishuk Authored: Mon Sep 8 17:25:17 2014 +0300 Committer: Andrew Onishuk Committed: Mon Sep 8 17:25:17 2014 +0300 -- .../libraries/script/script.py | 23 +--- .../1.3.2/hooks/before-START/scripts/params.py | 23 ++-- .../HDFS/package/scripts/hdfs_client.py | 6 ++ .../services/HDFS/package/scripts/params.py | 16 +- .../MAPREDUCE/configuration/mapred-env.xml | 20 +++ .../MAPREDUCE/package/scripts/client.py | 7 +++ .../MAPREDUCE/package/scripts/params.py | 13 + .../stacks/1.3.2/HDFS/test_hdfs_client.py | 59 .../1.3.2/MAPREDUCE/test_mapreduce_client.py| 36 +++- .../python/stacks/1.3.2/configs/default.json| 10 +++- 10 files changed, 182 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8299b1/ambari-common/src/main/python/resource_management/libraries/script/script.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 80bfeab..4caaa78 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -237,6 +237,20 @@ class Script(object): """ self.fail_with_error('configure method isn\'t implemented') + def generate_configs_get_template_file_content(self, filename, dicts): +import params +content = '' +for dict in dicts.split(','): + if dict.strip() in params.config['configurations']: +content += params.config['configurations'][dict.strip()]['content'] + +return content + + def generate_configs_get_xml_file_content(self, filename, dict): +import params +return {'configurations':params.config['configurations'][dict], + 'configuration_attributes':params.config['configuration_attributes'][dict]} + def generate_configs(self, env): """ Generates config files and stores them as an archive in tmp_dir @@ -254,17 +268,12 @@ class Script(object): for filename, dict in file_dict.iteritems(): XmlConfig(filename, conf_dir=conf_tmp_dir, - configurations=params.config['configurations'][dict], - configuration_attributes=params.config['configuration_attributes'][dict], + **self.generate_configs_get_xml_file_content(filename, dict) ) for file_dict in env_configs_list: for filename,dicts in file_dict.iteritems(): -content = '' -for dict in dicts.split(','): - if dict.strip() in params.config['configurations']: -content += params.config['configurations'][dict.strip()]['content'] File(os.path.join(conf_tmp_dir, filename), - content=InlineTemplate(content)) + content=InlineTemplate(self.generate_configs_get_template_file_content(filename, dicts))) with closing(tarfile.open(output_filename, "w:gz")) as tar: tar.add(conf_tmp_dir, arcname=os.path.basename(".")) tar.close() http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8299b1/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py index afbacbb..51f8d61 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py @@ -134,27 +134,12 @@ mapred_local_dir = "/tmp/hadoop-mapred/mapred/local" dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None) #log4j.properties -rca_properties = format(''' -ambari.jobhistory.database={ambari_db_rca_url} -ambari.jobhistory.driver={ambari_db_rca_driver} -ambari.jobhistory.user={ambari_db_rca_username} -ambari.jobhistory.password={ambari_db_rca_password} -ambari.jobhistory.logger=${{hadoop.root.logger}} +if 'mapred-env' in config['configurations'] and 'rca_properties' in config['config
git commit: AMBARI-7197. Add rca properties to log4j.properties from Download Configs. (aonishuk)
Repository: ambari Updated Branches: refs/heads/trunk 8b26d8b0b -> 7c8299b1c AMBARI-7197. Add rca properties to log4j.properties from Download Configs. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c8299b1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c8299b1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c8299b1 Branch: refs/heads/trunk Commit: 7c8299b1c5f1885af8da1fa68a75d89d0a07a601 Parents: 8b26d8b Author: Andrew Onishuk Authored: Mon Sep 8 17:25:17 2014 +0300 Committer: Andrew Onishuk Committed: Mon Sep 8 17:25:17 2014 +0300 -- .../libraries/script/script.py | 23 +--- .../1.3.2/hooks/before-START/scripts/params.py | 23 ++-- .../HDFS/package/scripts/hdfs_client.py | 6 ++ .../services/HDFS/package/scripts/params.py | 16 +- .../MAPREDUCE/configuration/mapred-env.xml | 20 +++ .../MAPREDUCE/package/scripts/client.py | 7 +++ .../MAPREDUCE/package/scripts/params.py | 13 + .../stacks/1.3.2/HDFS/test_hdfs_client.py | 59 .../1.3.2/MAPREDUCE/test_mapreduce_client.py| 36 +++- .../python/stacks/1.3.2/configs/default.json| 10 +++- 10 files changed, 182 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8299b1/ambari-common/src/main/python/resource_management/libraries/script/script.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 80bfeab..4caaa78 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -237,6 +237,20 @@ class Script(object): """ self.fail_with_error('configure method isn\'t implemented') + def generate_configs_get_template_file_content(self, filename, dicts): +import params +content = '' +for dict in dicts.split(','): + if dict.strip() in params.config['configurations']: +content += params.config['configurations'][dict.strip()]['content'] + +return content + + def generate_configs_get_xml_file_content(self, filename, dict): +import params +return {'configurations':params.config['configurations'][dict], + 'configuration_attributes':params.config['configuration_attributes'][dict]} + def generate_configs(self, env): """ Generates config files and stores them as an archive in tmp_dir @@ -254,17 +268,12 @@ class Script(object): for filename, dict in file_dict.iteritems(): XmlConfig(filename, conf_dir=conf_tmp_dir, - configurations=params.config['configurations'][dict], - configuration_attributes=params.config['configuration_attributes'][dict], + **self.generate_configs_get_xml_file_content(filename, dict) ) for file_dict in env_configs_list: for filename,dicts in file_dict.iteritems(): -content = '' -for dict in dicts.split(','): - if dict.strip() in params.config['configurations']: -content += params.config['configurations'][dict.strip()]['content'] File(os.path.join(conf_tmp_dir, filename), - content=InlineTemplate(content)) + content=InlineTemplate(self.generate_configs_get_template_file_content(filename, dicts))) with closing(tarfile.open(output_filename, "w:gz")) as tar: tar.add(conf_tmp_dir, arcname=os.path.basename(".")) tar.close() http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8299b1/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py index afbacbb..51f8d61 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py @@ -134,27 +134,12 @@ mapred_local_dir = "/tmp/hadoop-mapred/mapred/local" dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None) #log4j.properties -rca_properties = format(''' -ambari.jobhistory.database={ambari_db_rca_url} -ambari.jobhistory.driver={ambari_db_rca_driver} -ambari.jobhistory.user={ambari_db_rca_username} -ambari.jobhistory.password={ambari_db_rca_password} -ambari.jobhistory.logger=${{hadoop.root.logger}} +if 'mapred-env