Repository: ambari Updated Branches: refs/heads/branch-windows-dev 051f5e160 -> 6b3f9a7f5
AMBARI-8192. [Test] Testing the services configuration fails (Florian Barca via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b3f9a7f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b3f9a7f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b3f9a7f Branch: refs/heads/branch-windows-dev Commit: 6b3f9a7f5518314418e823ee31e1967adc5fb1c5 Parents: 051f5e1 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Fri Nov 7 16:38:26 2014 -0800 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Fri Nov 7 16:38:26 2014 -0800 ---------------------------------------------------------------------- .../python/ambari_agent/CustomServiceOrchestrator.py | 4 ++-- ambari-server/pom.xml | 2 +- .../2.1/services/HBASE/configuration/hbase-env.xml | 3 +++ .../stacks/HDPWIN/2.1/services/HBASE/metainfo.xml | 12 ++++++------ .../HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6b3f9a7f/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py index bdcf532..64592f6 100644 --- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py +++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py @@ -185,10 +185,10 @@ class CustomServiceOrchestrator(): with open(tmperrfile, "a") as f: f.write(cancel_reason) - except Exception: # We do not want to let agent fail completely + except Exception, e: # We do not want to let agent fail completely exc_type, exc_obj, exc_tb = sys.exc_info() message = "Catched an exception while executing "\ - "custom service command: {0}: {1}".format(exc_type, exc_obj) + "custom service command: {0}: {1}; {2}".format(exc_type, exc_obj, str(e)) logger.exception(message) ret = { 'stdout' : message, http://git-wip-us.apache.org/repos/asf/ambari/blob/6b3f9a7f/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 955dd88..87e185d 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -189,7 +189,7 @@ <!-- Stack definitions --> <exclude>src/main/resources/stacks/HDP/2.0._/services/HBASE/package/templates/regionservers.j2</exclude> - <exclude>src/main/resources/stacks/HDPWIN/2.1/services/*/configuration/*</exclude> + <exclude>src/main/resources/stacks/HDPWIN/2.1/services/*/configuration*/*</exclude> <!--test samples --> <exclude>src/test/resources/TestAmbaryServer.samples/**</exclude> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b3f9a7f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml index 5638505..fc2ed7f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/configuration/hbase-env.xml @@ -125,3 +125,6 @@ set HBASE_USE_GC_LOGFILE=true @rem Tell HBase whether it should manage it's own instance of Zookeeper or not. @rem set HBASE_MANAGES_ZK=true + </value> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b3f9a7f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml index 38ce3b6..c44152f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml @@ -49,7 +49,7 @@ </dependency> </dependencies> <commandScript> - <script>scripts/hbase_master.py</script> + <script>scripts\hbase_master.py</script> <scriptType>PYTHON</scriptType> <timeout>600</timeout> </commandScript> @@ -57,7 +57,7 @@ <customCommand> <name>DECOMMISSION</name> <commandScript> - <script>scripts/hbase_master.py</script> + <script>scripts\hbase_master.py</script> <scriptType>PYTHON</scriptType> <timeout>600</timeout> </commandScript> @@ -71,7 +71,7 @@ <category>SLAVE</category> <cardinality>1+</cardinality> <commandScript> - <script>scripts/hbase_regionserver.py</script> + <script>scripts\hbase_regionserver.py</script> <scriptType>PYTHON</scriptType> </commandScript> </component> @@ -82,7 +82,7 @@ <category>CLIENT</category> <cardinality>1+</cardinality> <commandScript> - <script>scripts/hbase_client.py</script> + <script>scripts\hbase_client.py</script> <scriptType>PYTHON</scriptType> </commandScript> <configFiles> @@ -100,13 +100,13 @@ <type>env</type> <fileName>log4j.properties</fileName> <dictionaryName>hbase-log4j</dictionaryName> - </configFile> + </configFile> </configFiles> </component> </components> <commandScript> - <script>scripts/service_check.py</script> + <script>scripts\service_check.py</script> <scriptType>PYTHON</scriptType> <timeout>300</timeout> </commandScript> http://git-wip-us.apache.org/repos/asf/ambari/blob/6b3f9a7f/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py index 032ca79..91a33e4 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/webhcat.py @@ -25,6 +25,6 @@ import sys def webhcat(): import params XmlConfig("webhcat-site.xml", - conf_dir=params.config_dir, + conf_dir=params.hcat_config_dir, configurations=params.config['configurations']['webhcat-site'] )
