AMBARI-8192 - Testing services configuration fails (Florian Barca via abaranchuk)

ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py

@@ -193,10 +193,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,

ambari-server/src/main/assemblies/server-windows.xml

@@ -166,6 +166,7 @@
         <include>Ambari-DDL-SQLServer-*.sql</include>
         <include>custom_action_definitions/**</include>
         <include>custom_actions/**</include>
+        <include>host_scripts/**</include>
         <include>stacks/stack_advisor.py</include>
         <include>scripts/**</include>
         <include>stacks/HDPWIN/**</include>

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>

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>
@@ -106,7 +106,7 @@
       </components>
 
       <commandScript>
-        <script>scripts/service_check.py</script>
+        <script>scripts\service_check.py</script>
         <scriptType>PYTHON</scriptType>
         <timeout>300</timeout>
       </commandScript>

ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hadoop-env.xml

@@ -25,17 +25,9 @@
 <!-- Put site-specific property overrides in this file. -->
 
 <configuration>
-
-  <property>
-    <name>dfs.datanode.data.dir.mount.file</name>
-    <value>c:\hadoop\hdfs\dfs_data_dir_mount.hist</value>
-    <description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description>
-  </property>
-
   <property>
     <name>dfs.datanode.data.dir.mount.file</name>
     <value>file:///c:/hadoop/conf/dfs_data_dir_mount.hist</value>
     <description>File path that contains the last known mount point for each data dir. This file is used to avoid creating a DFS data dir on the root drive (and filling it up) if a path was previously mounted on a drive.</description>
   </property>
-
 </configuration>

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']
   )