You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/11/11 01:40:52 UTC
ambari git commit: AMBARI-8232. Download HIVE Client Config Fails.
(Florian Barca via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-windows-dev 8192a871b -> 5ab763de6
AMBARI-8232. Download HIVE Client Config Fails. (Florian Barca via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ab763de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ab763de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ab763de
Branch: refs/heads/branch-windows-dev
Commit: 5ab763de64041ee00801cee8c781f44ad92ec2d9
Parents: 8192a87
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Nov 10 16:40:20 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Nov 10 16:40:20 2014 -0800
----------------------------------------------------------------------
.../libraries/script/script.py | 6 +-
.../HDPWIN/2.1/services/HIVE/metainfo.xml | 85 ++++++++++++--------
2 files changed, 56 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ab763de/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 d58502a..ff7d28b 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
@@ -285,7 +285,11 @@ class Script(object):
content = ''
for dict in dicts.split(','):
if dict.strip() in config['configurations']:
- content += config['configurations'][dict.strip()]['content']
+ try:
+ content += config['configurations'][dict.strip()]['content']
+ except Fail:
+ # 'content' section not available in the component client configuration
+ pass
return content
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ab763de/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml
index ed6be9e..af45930 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/metainfo.xml
@@ -82,40 +82,6 @@
<scriptType>PYTHON</scriptType>
</commandScript>
</component>
-
- <component>
- <name>MYSQL_SERVER</name>
- <displayName>MySQL Server</displayName>
- <category>MASTER</category>
- <cardinality>1</cardinality>
- <commandScript>
- <script>scripts/mysql_server.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
- </component>
-
- <component>
- <name>HIVE_CLIENT</name>
- <displayName>Hive Client</displayName>
- <category>CLIENT</category>
- <cardinality>0+</cardinality>
- <commandScript>
- <script>scripts/hive_client.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
- </component>
-
- <component>
- <name>HCAT</name>
- <displayName>HCat Client</displayName>
- <category>CLIENT</category>
- <cardinality>0+</cardinality>
- <commandScript>
- <script>scripts/hcat_client.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
- </component>
-
<component>
<name>WEBHCAT_SERVER</name>
<displayName>WebHCat Server</displayName>
@@ -168,6 +134,57 @@
<timeout>1200</timeout>
</commandScript>
</component>
+ <component>
+ <name>MYSQL_SERVER</name>
+ <displayName>MySQL Server</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/mysql_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ </component>
+
+ <component>
+ <name>HIVE_CLIENT</name>
+ <displayName>Hive Client</displayName>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>hive-site.xml</fileName>
+ <dictionaryName>hive-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>hive-env.cmd</fileName>
+ <dictionaryName>hive-env</dictionaryName>
+ </configFile>
+ </configFiles>
+ </component>
+ <component>
+ <name>HCAT</name>
+ <displayName>HCat Client</displayName>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ <configFiles>
+ <configFile>
+ <type>env</type>
+ <fileName>hcat-env.cmd</fileName>
+ <dictionaryName>hcat-env</dictionaryName>
+ </configFile>
+ </configFiles>
+ </component>
+
</components>
<commandScript>