Repository: ambari Updated Branches: refs/heads/trunk 32896cb68 -> 9cb96ad08
AMBARI-19238. Avoid copying hadoop xml files for druid configs (Nishant Bangarwa via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9cb96ad0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9cb96ad0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9cb96ad0 Branch: refs/heads/trunk Commit: 9cb96ad08fe2ff148a4fdb148fc6358ebb8155d0 Parents: 32896cb Author: Sumit Mohanty <[email protected]> Authored: Mon Dec 19 07:04:14 2016 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Mon Dec 19 07:04:14 2016 -0800 ---------------------------------------------------------------------- .../DRUID/0.9.2/configuration/druid-env.xml | 1 + .../DRUID/0.9.2/package/scripts/druid.py | 37 -------------------- .../test/python/stacks/2.6/DRUID/test_druid.py | 24 ------------- 3 files changed, 1 insertion(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9cb96ad0/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml index fa24cac..539ef0c 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml +++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-env.xml @@ -231,6 +231,7 @@ export DRUID_LOG_DIR={{druid_log_dir}} export DRUID_CONF_DIR={{druid_conf_dir}} export DRUID_LIB_DIR={{druid_home}}/lib + export HADOOP_CONF_DIR={{hadoop_conf_dir}} </value> <value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/9cb96ad0/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py index 6ace5e3..6ddedac 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py +++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py @@ -80,43 +80,6 @@ def druid(upgrade_type=None, nodeType=None): Logger.info("Created log rotate file") - # Write Hadoop Configs if configured - if 'core-site' in params.config['configurations']: - XmlConfig("core-site.xml", - conf_dir=params.druid_common_conf_dir, - configurations=params.config['configurations']['core-site'], - configuration_attributes=params.config['configuration_attributes']['core-site'], - owner=params.druid_user, - group=params.user_group - ) - - if 'mapred-site' in params.config['configurations']: - XmlConfig("mapred-site.xml", - conf_dir=params.druid_common_conf_dir, - configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], - owner=params.druid_user, - group=params.user_group - ) - - if 'yarn-site' in params.config['configurations']: - XmlConfig("yarn-site.xml", - conf_dir=params.druid_common_conf_dir, - configurations=params.config['configurations']['yarn-site'], - configuration_attributes=params.config['configuration_attributes']['yarn-site'], - owner=params.druid_user, - group=params.user_group - ) - - if 'hdfs-site' in params.config['configurations']: - XmlConfig("hdfs-site.xml", - conf_dir=params.druid_common_conf_dir, - configurations=params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], - owner=params.druid_user, - group=params.user_group - ) - # node specific configs for node_type in ['coordinator', 'overlord', 'historical', 'broker', 'middleManager', 'router']: node_config_dir = format('{params.druid_conf_dir}/{node_type}') http://git-wip-us.apache.org/repos/asf/ambari/blob/9cb96ad0/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py index 9c3353f..95cbb94 100644 --- a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py +++ b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py @@ -441,30 +441,6 @@ class TestDruid(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['druid-logrotate']['content']) ) - self.assertResourceCalled('XmlConfig', "core-site.xml", - conf_dir=format('/usr/hdp/current/{role}/conf/_common'), - configurations=self.getConfig()['configurations']['core-site'], - configuration_attributes=self.getConfig()['configuration_attributes']['core-site'], - owner='druid', - group='hadoop' - ) - - self.assertResourceCalled('XmlConfig', "yarn-site.xml", - conf_dir=format('/usr/hdp/current/{role}/conf/_common'), - configurations=self.getConfig()['configurations']['yarn-site'], - configuration_attributes=self.getConfig()['configuration_attributes']['yarn-site'], - owner='druid', - group='hadoop' - ) - - self.assertResourceCalled('XmlConfig', "hdfs-site.xml", - conf_dir=format('/usr/hdp/current/{role}/conf/_common'), - configurations=self.getConfig()['configurations']['hdfs-site'], - configuration_attributes=self.getConfig()['configuration_attributes']['hdfs-site'], - owner='druid', - group='hadoop' - ) - self.assertResourceCalled('PropertiesFile', "runtime.properties", dir=format('/usr/hdp/current/{role}/conf/coordinator'), properties=self.getConfig()['configurations']['druid-coordinator'],
