Repository: ambari Updated Branches: refs/heads/trunk 638862c6d -> a2c86f2a2
AMBARI-10707. AMS does not work with NN HA in AMS distrbuted mode. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a2c86f2a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2c86f2a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2c86f2a Branch: refs/heads/trunk Commit: a2c86f2a20a82fb78f07b4107bbac7ee40d94529 Parents: 638862c Author: Siddharth Wagle <[email protected]> Authored: Thu Apr 23 11:22:52 2015 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Thu Apr 23 11:34:34 2015 -0700 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c86f2a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index 68ee119..8cbbed2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -72,7 +72,27 @@ def ams(name=None): owner=params.ams_user, content=InlineTemplate(params.ams_env_sh_template) ) + pass + + if params.is_hbase_distributed: + # Configuration needed to support NN HA + XmlConfig("hdfs-site.xml", + conf_dir=params.ams_collector_conf_dir, + configurations=params.config['configurations']['hdfs-site'], + configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + owner=params.ams_user, + group=params.user_group, + mode=0644 + ) + XmlConfig("core-site.xml", + conf_dir=params.ams_collector_conf_dir, + configurations=params.config['configurations']['core-site'], + configuration_attributes=params.config['configuration_attributes']['core-site'], + owner=params.ams_user, + group=params.user_group, + mode=0644 + ) pass elif name == 'monitor': @@ -203,6 +223,27 @@ def ams(name=None): ) pass + if params.is_hbase_distributed: + # Configuration needed to support NN HA + XmlConfig("hdfs-site.xml", + conf_dir=params.ams_collector_conf_dir, + configurations=params.config['configurations']['hdfs-site'], + configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + owner=params.ams_user, + group=params.user_group, + mode=0644 + ) + + XmlConfig("core-site.xml", + conf_dir=params.ams_collector_conf_dir, + configurations=params.config['configurations']['core-site'], + configuration_attributes=params.config['configuration_attributes']['core-site'], + owner=params.ams_user, + group=params.user_group, + mode=0644 + ) + pass + elif name == 'monitor': Directory(params.ams_monitor_conf_dir, owner=params.ams_user,
