ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mithm...@apache.org
Subject ambari git commit: AMBARI-15107: Add theme and meta-data for HAWQ configurations (mithmatt)
Date Sun, 06 Mar 2016 20:17:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 79579989c -> 6fb4655ad


AMBARI-15107: Add theme and meta-data for HAWQ configurations (mithmatt)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fb4655a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fb4655a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fb4655a

Branch: refs/heads/trunk
Commit: 6fb4655ad22fe053f1fe1fa9167662a8998a902f
Parents: 7957998
Author: Matt <mmathew@pivotal.io>
Authored: Sun Mar 6 12:17:08 2016 -0800
Committer: Matt <mmathew@pivotal.io>
Committed: Sun Mar 6 12:17:08 2016 -0800

----------------------------------------------------------------------
 .../HAWQ/2.0.0/configuration/hawq-check-env.xml |   4 +-
 .../2.0.0/configuration/hawq-limits-env.xml     |  66 +-
 .../HAWQ/2.0.0/configuration/hawq-site.xml      |  80 ++-
 .../2.0.0/configuration/hawq-sysctl-env.xml     | 115 ++--
 .../HAWQ/2.0.0/configuration/hdfs-client.xml    | 677 ++++++++++++-------
 .../HAWQ/2.0.0/configuration/yarn-client.xml    | 203 +++---
 .../common-services/HAWQ/2.0.0/metainfo.xml     |  43 +-
 .../HAWQ/2.0.0/themes/theme.json                | 143 ++++
 8 files changed, 898 insertions(+), 433 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
index 185d175..9501a6a 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
@@ -16,7 +16,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-
 <configuration supports_adding_forbidden="true">
   <!-- hawq_check.cnf -->
     <property>
@@ -83,7 +82,8 @@ ipc.client.connection.maxidletime = 3600000
 dfs.namenode.accesstime.precision = -1
     </value>
     <value-attributes>
-        <type>content</type>
+      <type>content</type>
+      <show-property-name>false</show-property-name>
     </value-attributes>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
index 658161f..cd3d329 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
@@ -16,31 +16,49 @@
    limitations under the License.
 -->
 <configuration supports_adding_forbidden="true">
-    <property>
-        <display-name>soft nofile</display-name>
-        <name>soft_nofile</name>
-        <value>2900000</value>
-        <description>Soft limit for the number of file handles or open files for user gpadmin. Value is set in file /etc/security/limits.d/gpadmin.conf</description>
-    </property>
 
-    <property>
-        <display-name>hard nofile</display-name>
-        <name>hard_nofile</name>
-        <value>2900000</value>
-        <description>Hard limit for the number of file handles or open files for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
-    </property>
+  <property>
+    <display-name>soft nofile</display-name>
+    <name>soft_nofile</name>
+    <value>2900000</value>
+    <description>Soft limit for the number of file handles or open files for user gpadmin. Value is set in file /etc/security/limits.d/gpadmin.conf</description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
 
-    <property>
-        <display-name>soft nproc</display-name>
-        <name>soft_nproc</name>
-        <value>131072</value>
-        <description>Soft limit for the maximum number of processes for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
-    </property>
+  <property>
+    <display-name>hard nofile</display-name>
+    <name>hard_nofile</name>
+    <value>2900000</value>
+    <description>Hard limit for the number of file handles or open files for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <display-name>soft nproc</display-name>
+    <name>soft_nproc</name>
+    <value>131072</value>
+    <description>Soft limit for the maximum number of processes for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <display-name>hard nproc</display-name>
+    <name>hard_nproc</name>
+    <value>131072</value>
+    <description>Hard limit for the maximum number of processes for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
 
-    <property>
-        <display-name>hard nproc</display-name>
-        <name>hard_nproc</name>
-        <value>131072</value>
-        <description>Hard limit for the maximum number of processes for user gpadmin. Value is set in /etc/security/limits.d/gpadmin.conf</description>
-    </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 457c1d2..474f509 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -16,6 +16,7 @@
    limitations under the License.
 -->
 <configuration>
+
   <property>
     <name>hawq_master_address_host</name>
     <display-name>HAWQ Master</display-name>
@@ -37,6 +38,7 @@
     </description>
     <value-attributes>
       <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -61,6 +63,7 @@
     </description>
     <value-attributes>
       <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -71,6 +74,11 @@
     <description>
       URL for accessing HDFS.
     </description>
+    <value-attributes>
+      <type>string</type>
+      <overridable>false</overridable>
+      <editable-only-at-install>true</editable-only-at-install>
+    </value-attributes>
   </property>
 
   <property>
@@ -82,6 +90,8 @@
     </description>
     <value-attributes>
       <type>directory</type>
+      <overridable>false</overridable>
+      <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
   </property>
 
@@ -94,8 +104,10 @@
     </description>
     <value-attributes>
       <type>directory</type>
+      <overridable>false</overridable>
+      <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-  </property> 
+  </property>
 
   <property>
     <name>hawq_master_temp_directory</name>
@@ -124,27 +136,54 @@
   <!-- HAWQ resource manager parameters -->
   <property>
     <name>hawq_global_rm_type</name>
+    <display-name>Resource Manager</display-name>
     <value>none</value>
-    <description>The resource manager type to start for allocating resource. 
-      'none' means HAWQ resource manager exclusively uses whole cluster; 'yarn' means HAWQ resource manager
-      contacts YARN resource manager to negotiate resource.
+    <description>
+      The resource manager to use for allocating resources.
+      When set to Native ('none'), HAWQ resource manager exclusively uses whole cluster.
+      When set to YARN ('yarn') HAWQ resource manager contacts YARN resource manager to negotiate resource.
     </description>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>
+        <entry>
+          <value>none</value>
+          <label>Native</label>
+        </entry>
+        <entry>
+          <value>yarn</value>
+          <label>YARN</label>
+        </entry>
+      </entries>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
   <property>
     <name>hawq_rm_memory_limit_perseg</name>
+    <display-name>Segment Memory Usage Limit</display-name>
     <value>64GB</value>
     <description>
-      The limit of memory usage in a HAWQ segment when hawq_global_rm_type is set 'none'.
+      The limit of memory usage in a HAWQ segment when Resource Manager (hawq_global_rm_type) is set to Native ('none').
     </description>
+    <value-attributes>
+      <type>string</type>
+    </value-attributes>
   </property>
 
   <property>
     <name>hawq_rm_nvcore_limit_perseg</name>
+    <display-name>Segment Virtual Core Usage Limit</display-name>
     <value>16</value>
     <description>
-      The limit of virtual core usage in a HAWQ segment when hawq_global_rm_type is set 'none'.
+      The limit of virtual core usage in a HAWQ segment when Resource Manager (hawq_global_rm_type) is set to Native ('none').
     </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>64</maximum>
+      <increment-step>4</increment-step>
+    </value-attributes>
   </property>
 
   <property>
@@ -159,6 +198,10 @@
         <name>yarn.resourcemanager.address</name>
       </property>
     </depends-on>
+    <value-attributes>
+      <type>string</type>
+      <overridable>false</overridable>
+    </value-attributes>
   </property>
 
   <property>
@@ -173,6 +216,10 @@
         <name>yarn.resourcemanager.scheduler.address</name>
       </property>
     </depends-on>
+    <value-attributes>
+      <type>string</type>
+      <overridable>false</overridable>
+    </value-attributes>
   </property>
 
   <property>
@@ -181,6 +228,9 @@
     <description>
       The YARN queue name to register HAWQ resource manager.
     </description>
+    <value-attributes>
+      <type>string</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -189,6 +239,9 @@
     <description>
       The application name to register HAWQ resource manager in YARN.
     </description>
+    <value-attributes>
+      <type>string</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -197,6 +250,9 @@
     <description>
       The control to enable/disable CPU resource enforcement.
     </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -206,6 +262,9 @@
       The mount point of CGroup file system for resource enforcement.
       For example, /sys/fs/cgroup/cpu/hawq for CPU sub-system.
     </description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -215,6 +274,9 @@
       The name of the hierarchy to accomodate CGroup directories/files for resource enforcement.
       For example, /sys/fs/cgroup/cpu/hawq for CPU sub-system.
     </description>
+    <value-attributes>
+      <type>string</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -222,13 +284,13 @@
     <display-name>Default Number of Virtual Segments</display-name>
     <value>24</value>
     <description>
-      The default number of virtual segments to use when executing a query statement. When the query is actually executed,
-      the number of virtual segments may differ from this number depending on the query's needs.
+      The default number of virtual segments to use when executing a query statement. When the query is actually executed, the number of virtual segments may differ from this number depending on the query's needs.
       When expanding the cluster, you should adjust this number to reflect the number of nodes in the new cluster times the number of virtual segments per node.
     </description>
     <value-attributes>
       <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
index d33d314..3ca9e87 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
@@ -22,8 +22,8 @@
     <description>Maximum size in bytes of a single shared memory segment that a Linux process can allocate in its
       virtual address space</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -32,8 +32,8 @@
     <value>4096</value>
     <description>System wide maximum number of shared memory segments</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -42,8 +42,8 @@
     <value>4000000000</value>
     <description>Total amount of shared memory pages that can be used system wide</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -52,8 +52,7 @@
     <value>250 512000 100 2048</value>
     <description>Parameter to define semaphore related values</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>string</type>
     </value-attributes>
   </property>
 
@@ -62,8 +61,9 @@
     <value>1</value>
     <description>Enable(1)/Disable(0) functions of sysrq</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -72,8 +72,9 @@
     <value>1</value>
     <description>Enable appending process id to the name of core dump file. Ex: core.PID</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -82,8 +83,8 @@
     <value>65536</value>
     <description>Default maximum size of a message in bytes</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -92,8 +93,8 @@
     <value>65536</value>
     <description>Default maxmimum size of a mesage queue</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -102,8 +103,8 @@
     <value>2048</value>
     <description>Number of message queue identifiers</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -112,8 +113,9 @@
     <value>0</value>
     <description>Enable(1)/Disable(0) SYN cookie protection</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -122,8 +124,9 @@
     <value>0</value>
     <description>Enable(1)/Disable(0) IP forwarding</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -132,8 +135,9 @@
     <value>0</value>
     <description>Enable(1)/Disable(0) IP source routing</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -142,8 +146,9 @@
     <value>1</value>
     <description>Enable(1)/Disable(0) fast recycling of TIME_WAIT sockets</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -152,8 +157,8 @@
     <value>200000</value>
     <description>Number of outstanding syn requests allowed</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -162,8 +167,9 @@
     <value>1</value>
     <description>Enable(1)/Disable(0) route lookup to determine the interface through which to send the reply</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
+      <maximum>1</maximum>
     </value-attributes>
   </property>
 
@@ -172,8 +178,7 @@
     <value>1281 65535</value>
     <description>Local port range that is used by TCP and UDP traffic to choose the local port</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>string</type>
     </value-attributes>
   </property>
 
@@ -182,8 +187,8 @@
     <value>200000</value>
     <description>Maximum number of packets allowed to queue when a particular interface receives packets faster than the kernel can process them</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -192,8 +197,8 @@
     <value>3000000</value>
     <description>Maximum number of file-handles a process can allocate</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -202,8 +207,8 @@
     <value>798720</value>
     <description>System-wide maximum number of threads to be used by the kernel at one time</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -212,8 +217,8 @@
     <value>798720</value>
     <description>Maximum number of unique process identifiers</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -222,8 +227,8 @@
     <value>2097152</value>
     <description>Maximum receive socket buffer size in bytes</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
@@ -232,16 +237,34 @@
     <value>2097152</value>
     <description>Maximum send socket buffer size in bytes</description>
     <value-attributes>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
+      <type>int</type>
+      <minimum>0</minimum>
     </value-attributes>
   </property>
 
   <property>
     <name>vm.overcommit_memory</name>
+    <display-name>VM Overcommit</display-name>
     <value>1</value>
-    <description>Defines the conditions that determine whether a large memory request is accepted or denied. There are
-      three possible values for this parameter: 0, 1 or 2. For production environment, value of 2 is recommended</description>
+    <description>Defines the conditions that determine whether a large memory request is accepted or denied. There are three possible values for this parameter: 0, 1 or 2. For production environment, value of 2 is recommended</description>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>
+        <entry>
+          <value>0</value>
+          <description>Heuristic overcommit handling</description>
+        </entry>
+        <entry>
+          <value>1</value>
+          <description>Always overcommit</description>
+        </entry>
+        <entry>
+          <value>2</value>
+          <description>Don't overcommit</description>
+        </entry>
+      </entries>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
   </property>
 
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
index 053f108..7518c6b 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
@@ -18,263 +18,424 @@
 
 <configuration>
 
-	<property>
-		<name>rpc.client.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval of an RPC invocation in milliseconds. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.connect.tcpnodelay</name>
-		<value>true</value>
-		<description>
-		This parameter indicates whether TCP_NODELAY is set to true for connecting to the RPC server. The default is set to true.
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.max.idle</name>
-		<value>10000</value>
-		<description>
-		The max idle time of an RPC connection in milliseconds. The default is set to 10000 (10 seconds).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.ping.interval</name>
-		<value>10000</value>
-		<description>
-		The periodic interval in milliseconds at which the RPC client sends a heart beat to the server. 0 indicates disabled. The default is set to 10000 (10 seconds).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.connect.timeout</name>
-		<value>600000</value>
-		<description>
-		The timeout interval in milliseconds when the RPC client is trying to setup the connection. The default is set to 600000 (10 minutes).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.connect.retry</name>
-		<value>10</value>
-		<description>
-		The maximum times to retry if the RPC client fails to setup the connection to the server. The default is set to 10.
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.read.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the RPC client is trying to read from the server. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.write.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the RPC client is trying to write to the server. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>rpc.client.socket.linger.timeout</name>
-		<value>-1</value>
-		<description>
-		The value to be set for socket SO_LINGER when connecting to the RPC server. The default value is -1.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.client.read.shortcircuit</name>
-		<value>true</value>
-		<description>
-		If set to true the datanode is bypassed when reading file blocks, if the block and the client are on the same node. The default is set to true.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.default.replica</name>
-		<value>3</value>
-		<description>
-		The default number of replicas. The default is set to 3.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.prefetchsize</name>
-		<value>10</value>
-		<description>
-		The default number of blocks for which information will be pre-fetched. The default is set to 10.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.client.failover.max.attempts</name>
-		<value>15</value>
-		<description>
-		The maximum number of times to retry when the dfs client is trying to issue an RPC call, if multiple namenodes are configured. The default is set to 15.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.default.blocksize</name>
-		<value>134217728</value>
-		<description>
-		The default block size in bytes. The default is set to 134217728 (128 MB).
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.client.log.severity</name>
-		<value>INFO</value>
-		<description>
-		The minimal log severity level, valid values include FATAL, ERROR, INFO, DEBUG1, DEBUG2, DEBUG3. The default is set to INFO.
-		</description>
-	</property>
-
-	<property>
-		<name>input.connect.timeout</name>
-		<value>600000</value>
-		<description>
-		The timeout interval in milliseconds when the input stream is trying to setup the connection to a datanode. The default is set to 600000 (10 minutes).
-		</description>
-	</property>
-
-	<property>
-		<name>input.read.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the input stream is trying to read from a datanode. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>input.write.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the input stream is trying to write to a datanode. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>input.localread.default.buffersize</name>
-		<value>2097152</value>
-		<description>
-		The buffer size in bytes which is to be used to hold the data from the file block and to verify the checksum.
-		It is only used when 'dfs.client.read.shortcircuit' is set to true. The default is set to 1048576 (1 MB).
-		</description>
-	</property>
-
-	<property>
-		<name>input.localread.blockinfo.cachesize</name>
-		<value>1000</value>
-		<description>
-		The size of file block path information cache in bytes. The default is set to 1000 bytes.
-		</description>
-	</property>
-
-	<property>
-		<name>input.read.getblockinfo.retry</name>
-		<value>3</value>
-		<description>
-		The maximum number of times to retry when the client fails to get block information from the namenode. The default is set to 3.
-		</description>
-	</property>
-
-	<property>
-		<name>output.replace-datanode-on-failure</name>
-		<value>false</value>
-		<description>
-		If set to true, the client adds a new datanode into pipeline if the number of nodes in the pipeline is less than the specified number of replicas. The default is set to true.
-		</description>
-	</property>
-
-	<property>
-		<name>output.default.chunksize</name>
-		<value>512</value>
-		<description>
-		The chunk size (in bytes) in the pipeline. The default is set to 512 bytes.
-		</description>
-	</property>
-
-	<property>
-		<name>output.default.packetsize</name>
-		<value>65536</value>
-		<description>
-		The packet size (in bytes) in the pipeline. The default is set to 65536 (64 kB).
-		</description>
-	</property>
-
-	<property>
-		<name>output.default.write.retry</name>
-		<value>10</value>
-		<description>
-		The maximum number of times to  retry when the client fails to set up the pipeline. The default is set to 10.
-		</description>
-	</property>
-
-	<property>
-		<name>output.connect.timeout</name>
-		<value>600000</value>
-		<description>
-		The timeout interval in milliseconds when the output stream is trying to setup the connection to a datanode. The default is set to 600000 (10 minutes).
-		</description>
-	</property>
-
-	<property>
-		<name>output.read.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the output stream is trying to read from a datanode. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>output.write.timeout</name>
-		<value>3600000</value>
-		<description>
-		The timeout interval in milliseconds when the output stream is trying to write to a datanode. The default is set to 3600000 (1 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>output.packetpool.size</name>
-		<value>1024</value>
-		<description>
-		The maximum number of packets in a file's packet pool. The default is set to 1024.
-		</description>
-	</property>
-
-	<property>
-		<name>output.close.timeout</name>
-		<value>900000</value>
-		<description>
-		The timeout interval in milliseconds when closing an output stream. The default is set to 900000 (1.5 hour).
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.domain.socket.path</name>
-		<value>/var/lib/hadoop-hdfs/dn_socket</value>
-		<description>
-		Optional: This is the path to a UNIX domain socket that will be used for communication between the datanode and local HDFS clients.
-		If the string "_PORT" is present in this path, it will be replaced by the TCP port of the datanode.
-		</description>
-	</property>
-
-	<property>
-		<name>dfs.client.use.legacy.blockreader.local</name>
-		<value>false</value>
-		<description>
-		If this configuration is set to true, the legacy short-circuit reader implementation based on HDFS-2246 is used.
-		This implementation is used on platforms other than Linux which does not have the new implementation based on HDFS-347.
-		</description>
-	</property>
+  <property>
+    <name>rpc.client.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval of an RPC invocation, in milliseconds. The default is 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.tcpnodelay</name>
+    <value>true</value>
+    <description>
+      Determines whether TCP_NODELAY is used when connecting to the RPC server. The default is true.
+    </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.max.idle</name>
+    <value>10000</value>
+    <description>
+      The maximum idle time for an RPC connection, in milliseconds. The default is 10000 (10 seconds).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.ping.interval</name>
+    <value>10000</value>
+    <description>
+      The periodic interval, in milliseconds, at which the RPC client sends a heart beat to the server. A value of zero (0) disables the heartbeat. The default 10000 (10 seconds).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.timeout</name>
+    <value>600000</value>
+    <description>
+      The timeout interval for establishing the RPC client connection, in milliseconds. The default is 600000 (10 minutes).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.retry</name>
+    <value>10</value>
+    <description>
+      The maximum number of times to retry a connection if the RPC client fails connect to the server. The default is 10.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.read.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval, in milliseconds, for when the RPC client is reading from the server. The default is 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.write.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval, in milliseconds, for when the RPC client is writing to the server. The default is 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.socket.linger.timeout</name>
+    <value>-1</value>
+    <description>
+      The value to set for the SO_LINGER socket when connecting to the RPC server. The default value is -1.
+    </description>
+    <value-attributes>
+      <type>int</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.client.read.shortcircuit</name>
+    <value>true</value>
+    <description>
+      Determines whether the DataNode is bypassed when reading file blocks, if the block and client are on the same node. The default value, true, bypasses the DataNode.
+    </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.default.replica</name>
+    <value>3</value>
+    <description>
+      The default number of replicas. The default value is 3.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.prefetchsize</name>
+    <value>10</value>
+    <description>
+      The default number of blocks for which information will be pre-fetched. The default is set to 10.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.client.failover.max.attempts</name>
+    <value>15</value>
+    <description>
+      The maximum number of times to retry when the dfs client is trying to issue an RPC call, if multiple namenodes are configured. The default is set to 15.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.default.blocksize</name>
+    <value>134217728</value>
+    <description>
+      The default block size in bytes. The default is set to 134217728 (128 MB).
+    </description>
+  	<value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.client.log.severity</name>
+    <value>INFO</value>
+    <description>
+      The minimal log severity level, valid values include FATAL, ERROR, INFO, DEBUG1, DEBUG2, DEBUG3. The default is set to INFO.
+    </description>
+    <value-attributes>
+      <type>value-list</type>
+      <entries>
+        <entry>
+          <value>INFO</value>
+        </entry>
+        <entry>
+          <value>FATAL</value>
+        </entry>
+        <entry>
+          <value>ERROR</value>
+        </entry>
+        <entry>
+          <value>DEBUG1</value>
+        </entry>
+        <entry>
+          <value>DEBUG2</value>
+        </entry>
+        <entry>
+          <value>DEBUG3</value>
+        </entry>
+      </entries>
+      <selection-cardinality>1</selection-cardinality>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>input.connect.timeout</name>
+    <value>600000</value>
+    <description>
+    The timeout interval in milliseconds when the input stream is trying to setup the connection to a datanode. The default is set to 600000 (10 minutes).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>input.read.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval in milliseconds when the input stream is trying to read from a datanode. The default is set to 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>input.write.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval in milliseconds when the input stream is trying to write to a datanode. The default is set to 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>input.localread.default.buffersize</name>
+    <value>2097152</value>
+    <description>
+      The buffer size in bytes which is to be used to hold the data from the file block and to verify the checksum.
+      It is only used when 'dfs.client.read.shortcircuit' is set to true. The default is set to 1048576 (1 MB).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>input.localread.blockinfo.cachesize</name>
+    <value>1000</value>
+    <description>
+      The size of file block path information cache in bytes. The default is set to 1000 bytes.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>input.read.getblockinfo.retry</name>
+    <value>3</value>
+    <description>
+      The maximum number of times to retry when the client fails to get block information from the namenode. The default is set to 3.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.replace-datanode-on-failure</name>
+    <value>false</value>
+    <description>
+      If set to true, the client adds a new datanode into pipeline if the number of nodes in the pipeline is less than the specified number of replicas. The default is set to true.
+    </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.default.chunksize</name>
+    <value>512</value>
+    <description>
+      The chunk size (in bytes) in the pipeline. The default is set to 512 bytes.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>output.default.packetsize</name>
+    <value>65536</value>
+    <description>
+      The packet size (in bytes) in the pipeline. The default is set to 65536 (64 kB).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>output.default.write.retry</name>
+    <value>10</value>
+    <description>
+      The maximum number of times to retry when the client fails to set up the pipeline. The default is set to 10.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.connect.timeout</name>
+    <value>600000</value>
+    <description>
+      The timeout interval in milliseconds when the output stream is trying to setup the connection to a datanode. The default is set to 600000 (10 minutes).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.read.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval in milliseconds when the output stream is trying to read from a datanode. The default is set to 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.write.timeout</name>
+    <value>3600000</value>
+    <description>
+      The timeout interval in milliseconds when the output stream is trying to write to a datanode. The default is set to 3600000 (1 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>output.packetpool.size</name>
+    <value>1024</value>
+    <description>
+      The maximum number of packets in a file's packet pool. The default is set to 1024.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>bytes</unit>
+  	</value-attributes>
+  </property>
+
+  <property>
+    <name>output.close.timeout</name>
+    <value>900000</value>
+    <description>
+      The timeout interval in milliseconds when closing an output stream. The default is set to 900000 (1.5 hour).
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.domain.socket.path</name>
+    <value>/var/lib/hadoop-hdfs/dn_socket</value>
+    <description>
+      Optional: This is the path to a UNIX domain socket that will be used for communication between the datanode and local HDFS clients.
+      If the string "_PORT" is present in this path, it will be replaced by the TCP port of the datanode.
+    </description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>dfs.client.use.legacy.blockreader.local</name>
+    <value>false</value>
+    <description>
+      If this configuration is set to true, the legacy short-circuit reader implementation based on HDFS-2246 is used.
+      This implementation is used on platforms other than Linux which does not have the new implementation based on HDFS-347.
+    </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+  </property>
 
 </configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
index a2296a1..cd7e6be 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
@@ -17,83 +17,132 @@
 -->
 
 <configuration>
+
 	<!-- RPC client configuration -->
-      <property>
-          <name>rpc.client.timeout</name>
-          <value>3600000</value>
-          <description>
-          Timeout interval of a RPC invocation in millisecond. Default is 3600000.
-          </description>
-        </property>
-        <property>
-          <name>rpc.client.connect.tcpnodelay</name>
-          <value>true</value>
-          <description>
-          Whether to set socket TCP_NODELAY to true when connecting to RPC server. Default is true.
-          </description>
-        </property>
+  <property>
+    <name>rpc.client.timeout</name>
+    <value>3600000</value>
+    <description>
+      Timeout interval of a RPC invocation in millisecond. Default is 3600000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.tcpnodelay</name>
+    <value>true</value>
+    <description>
+      Whether to set socket TCP_NODELAY to true when connecting to RPC server. Default is true.
+    </description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.max.idle</name>
+    <value>10000</value>
+    <description>
+      Max idle time of a RPC connection in milliseconds. Default is 10000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.ping.interval</name>
+    <value>10000</value>
+    <description>
+      Interval at which the RPC client sends a heart beat to server. 0 means disable, default is 10000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.timeout</name>
+    <value>600000</value>
+    <description>
+      Timeout interval in milliseconds for which RPC client tries to setup the connection. Default is 600000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.connect.retry</name>
+    <value>10</value>
+    <description>
+      Max retry attempts if the RPC client fails to setup the connection to server. Default is 10.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.read.timeout</name>
+    <value>3600000</value>
+    <description>
+      Timeout interval in milliseconds when the RPC client is trying to read from server. Default is 3600000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.write.timeout</name>
+    <value>3600000</value>
+    <description>
+      Timeout interval in milliseconds when the RPC client is trying to write to server. Default is 3600000.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>rpc.client.socket.linger.timeout</name>
+    <value>-1</value>
+    <description>
+      Set value to socket SO_LINGER when connecting to RPC server. -1 means default OS value. Default is -1.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+      <unit>milliseconds</unit>
+    </value-attributes>
+  </property>
 
-        <property>
-          <name>rpc.client.max.idle</name>
-          <value>10000</value>
-          <description>
-          Max idle time of a RPC connection in milliseconds. Default is 10000.
-          </description>
-        </property>
-        
-        <property>
-          <name>rpc.client.ping.interval</name>
-          <value>10000</value>
-          <description>
-          Interval at which the RPC client sends a heart beat to server. 0 means disable, default is 10000.
-          </description>
-        </property>
-        
-        <property>
-          <name>rpc.client.connect.timeout</name>
-          <value>600000</value>
-          <description>
-          Timeout interval in milliseconds for which RPC client tries to setup the connection. Default is 600000.
-          </description>
-        </property>
-        
-        <property>
-          <name>rpc.client.connect.retry</name>
-          <value>10</value>
-          <description>
-          Max retry attempts if the RPC client fails to setup the connection to server. Default is 10.
-          </description>
-        </property>
-        
-        <property>
-          <name>rpc.client.read.timeout</name>
-          <value>3600000</value>
-          <description>
-          Timeout interval in milliseconds when the RPC client is trying to read from server. Default is 3600000.
-          </description>
-        </property>
+  <property>
+    <name>yarn.client.failover.max.attempts</name>
+    <value>15</value>
+    <description>
+      If multiple resource managers are configured, it is the max retry attempts for which yarn client tries to issue a RPC call. Default is 15.
+    </description>
+    <value-attributes>
+      <type>int</type>
+      <minimum>0</minimum>
+    </value-attributes>
+  </property>
 
-        <property>
-          <name>rpc.client.write.timeout</name>
-          <value>3600000</value>
-          <description>
-          Timeout interval in milliseconds when the RPC client is trying to write to server. Default is 3600000.
-          </description>
-        </property>
-        
-        <property>
-          <name>rpc.client.socket.linger.timeout</name>
-          <value>-1</value>
-          <description>
-          Set value to socket SO_LINGER when connecting to RPC server. -1 means default OS value. Default is -1.
-          </description>
-        </property>
-        
-        <property>
-          <name>yarn.client.failover.max.attempts</name>
-          <value>15</value>
-          <description>
-          If multiple resource managers are configured, it is the max retry attempts for which yarn client tries to issue a RPC call. Default is 15.
-          </description>
-        </property>
-</configuration>
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
index b6fc6dd..e35b7d8 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/metainfo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,17 +15,18 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-
 <metainfo>
   <schemaVersion>2.0</schemaVersion>
   <services>
+
     <service>
+
       <name>HAWQ</name>
       <displayName>HAWQ</displayName>
       <comment>Apache HAWQ - Hadoop Native SQL for High-Performance Advanced Analytics</comment>
       <version>2.0.0</version>
-      <components>
 
+      <components>
         <component>
           <name>HAWQMASTER</name>
           <displayName>HAWQ Master</displayName>
@@ -83,22 +84,22 @@
               <name>HDFS/HDFS_CLIENT</name>
               <scope>host</scope>
               <auto-deploy>
-                  <enabled>true</enabled>
+                <enabled>true</enabled>
               </auto-deploy>
             </dependency>
           </dependencies>
         </component>
 
-      <component>
+        <component>
           <name>HAWQSTANDBY</name>
           <displayName>HAWQ Standby Master</displayName>
           <category>MASTER</category>
           <cardinality>0-1</cardinality>
           <timelineAppid>HAWQ</timelineAppid>
           <commandScript>
-              <script>scripts/hawqstandby.py</script>
-              <scriptType>PYTHON</scriptType>
-              <timeout>600</timeout>
+            <script>scripts/hawqstandby.py</script>
+            <scriptType>PYTHON</scriptType>
+            <timeout>600</timeout>
           </commandScript>
           <customCommands>
             <customCommand>
@@ -120,14 +121,14 @@
           </customCommands>
           <dependencies>
             <dependency>
-                <name>HDFS/HDFS_CLIENT</name>
-                <scope>host</scope>
-                <auto-deploy>
-                    <enabled>true</enabled>
-                </auto-deploy>
+              <name>HDFS/HDFS_CLIENT</name>
+              <scope>host</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
             </dependency>
           </dependencies>
-      </component>
+        </component>
 
         <component>
           <name>HAWQSEGMENT</name>
@@ -152,14 +153,15 @@
           </customCommands>
         </component>
       </components>
+
       <requiredServices>
-          <service>HDFS</service>
+        <service>HDFS</service>
       </requiredServices>
 
       <osSpecifics>
         <osSpecific>
           <osFamily>any</osFamily>
-           <packages>
+          <packages>
             <package>
               <name>hawq</name>
             </package>
@@ -183,8 +185,15 @@
         <config-type>hawq-sysctl-env</config-type>
         <config-type>ams-ssl-client</config-type>
       </configuration-dependencies>
+
+      <themes>
+        <theme>
+          <fileName>theme.json</fileName>
+          <default>true</default>
+        </theme>
+      </themes>
+
     </service>
 
   </services>
 </metainfo>
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb4655a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json
new file mode 100644
index 0000000..aa35311
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/themes/theme.json
@@ -0,0 +1,143 @@
+{
+   "name":"default",
+   "description":"Default theme for HAWQ",
+   "configuration":{
+      "layouts":[
+         {
+            "name":"default",
+            "tabs":[
+               {
+                  "name":"settings",
+                  "display-name":"Settings",
+                  "layout":{
+                     "tab-columns":"2",
+                     "tab-rows":"1",
+                     "sections":[
+                        {
+                           "name":"general",
+                           "display-name":"General",
+                           "row-index":"0",
+                           "column-index":"0",
+                           "row-span":"1",
+                           "column-span":"1",
+                           "section-columns":"1",
+                           "section-rows":"1",
+                           "subsections":[
+                              {
+                                 "name":"general-col1",
+                                 "row-index":"0",
+                                 "column-index":"0",
+                                 "row-span":"1",
+                                 "column-span":"1"
+                              }
+                           ]
+                        },
+                        {
+                           "name":"resource-management",
+                           "display-name":"Resource Management",
+                           "row-index":"0",
+                           "column-index":"1",
+                           "row-span":"1",
+                           "column-span":"1",
+                           "section-columns":"1",
+                           "section-rows":"1",
+                           "subsections":[
+                              {
+                                 "name":"resource-management-col1",
+                                 "row-index":"0",
+                                 "column-index":"0",
+                                 "row-span":"1",
+                                 "column-span":"1"
+                              }
+                           ]
+                        }
+                     ]
+                  }
+               }
+            ]
+         }
+      ],
+      "placement":{
+         "configuration-layout":"default",
+         "configs":[
+            {
+               "config":"hawq-site/hawq_master_directory",
+               "subsection-name":"general-col1"
+            },
+            {
+               "config":"hawq-site/hawq_segment_directory",
+               "subsection-name":"general-col1"
+            },
+            {
+               "config":"hawq-site/default_segment_num",
+               "subsection-name":"general-col1"
+            },
+            {
+               "config":"hawq-sysctl-env/vm.overcommit_memory",
+               "subsection-name":"general-col1"
+            },
+            {
+               "config":"hawq-site/hawq_global_rm_type",
+               "subsection-name":"resource-management-col1"
+            },
+            {
+               "config":"hawq-site/hawq_rm_memory_limit_perseg",
+               "subsection-name":"resource-management-col1"
+            },
+            {
+               "config":"hawq-site/hawq_rm_nvcore_limit_perseg",
+               "subsection-name":"resource-management-col1"
+            }
+         ]
+      },
+      "widgets":[
+         {
+            "config":"hawq-site/hawq_master_directory",
+            "widget":{
+               "type":"text-field"
+            }
+         },
+         {
+            "config":"hawq-site/hawq_segment_directory",
+            "widget":{
+               "type":"text-field"
+            }
+         },
+         {
+            "config":"hawq-site/default_segment_num",
+            "widget":{
+               "type":"text-field"
+            }
+         },
+         {
+            "config":"hawq-sysctl-env/vm.overcommit_memory",
+            "widget":{
+               "type":"combo"
+            }
+         },
+         {
+            "config":"hawq-site/hawq_global_rm_type",
+            "widget":{
+               "type":"combo"
+            }
+         },
+         {
+            "config":"hawq-site/hawq_rm_memory_limit_perseg",
+            "widget":{
+               "type":"text-field"
+            }
+         },
+         {
+            "config":"hawq-site/hawq_rm_nvcore_limit_perseg",
+            "widget":{
+               "type":"slider",
+               "units": [
+                  {
+                    "unit-name":"int"
+                  }
+               ]
+            }
+         }
+      ]
+   }
+}
\ No newline at end of file


Mime
View raw message