You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by bh...@apache.org on 2016/03/11 20:43:32 UTC
ambari git commit: AMBARI-15311: Update descriptions for HAWQ and PXF
configurations (Goutam Tadi via bhuvnesh2703)
Repository: ambari
Updated Branches:
refs/heads/trunk 304bdcfa5 -> c15b088ca
AMBARI-15311: Update descriptions for HAWQ and PXF configurations (Goutam Tadi via bhuvnesh2703)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c15b088c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c15b088c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c15b088c
Branch: refs/heads/trunk
Commit: c15b088ca3c0b0e5a69340ba9e95eeae3dbc3aad
Parents: 304bdcf
Author: Bhuvnesh Chaudhary <bc...@pivotal.io>
Authored: Fri Mar 11 11:43:34 2016 -0800
Committer: Bhuvnesh Chaudhary <bc...@pivotal.io>
Committed: Fri Mar 11 11:43:34 2016 -0800
----------------------------------------------------------------------
.../HAWQ/2.0.0/configuration/hawq-check-env.xml | 10 +-
.../HAWQ/2.0.0/configuration/hawq-env.xml | 8 +-
.../2.0.0/configuration/hawq-limits-env.xml | 20 ++-
.../HAWQ/2.0.0/configuration/hawq-site.xml | 61 ++++++---
.../2.0.0/configuration/hawq-sysctl-env.xml | 129 +++++++++++++++----
.../HAWQ/2.0.0/configuration/hdfs-client.xml | 101 ++++++++++-----
.../HAWQ/2.0.0/configuration/yarn-client.xml | 27 ++--
.../PXF/3.0.0/configuration/pxf-profiles.xml | 46 ++++---
.../configuration/pxf-public-classpath.xml | 12 +-
.../PXF/3.0.0/configuration/pxf-site.xml | 4 +-
10 files changed, 292 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 9501a6a..8cce4b7 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
@@ -21,7 +21,11 @@
<property>
<name>content</name>
<display-name>Content</display-name>
- <description>Contents of the configuration file /usr/local/hawq/etc/hawq_check.cnf. This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host. This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation.</description>
+ <description>
+ Contents of the configuration file /usr/local/hawq/etc/hawq_check.cnf.
+ This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host.
+ This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation.
+ </description>
<value>
[global]
configfile_version = 4
@@ -30,7 +34,7 @@ configfile_version = 4
mount.points = /
[linux.sysctl]
-sysctl.kernel.shmmax = 500000000
+sysctl.kernel.shmmax = 1000000000
sysctl.kernel.shmmni = 4096
sysctl.kernel.shmall = 4000000000
sysctl.kernel.sem = 250 512000 100 2048
@@ -45,7 +49,7 @@ sysctl.net.ipv4.conf.default.accept_source_route = 0
sysctl.net.ipv4.tcp_tw_recycle = 1
sysctl.net.ipv4.tcp_max_syn_backlog = 200000
sysctl.net.ipv4.conf.all.arp_filter = 1
-sysctl.net.ipv4.ip_local_port_range = 1281 65535
+sysctl.net.ipv4.ip_local_port_range = 1025 65535
sysctl.net.core.netdev_max_backlog = 200000
sysctl.vm.overcommit_memory = 2
sysctl.fs.nr_open = 3000000
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
index e40caca..fc5385f 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
@@ -21,10 +21,10 @@
<name>hawq_password</name>
<display-name>HAWQ System User Password</display-name>
<value></value>
- <description>The password of HAWQ system user.
- During cluster initialization and when provisioning new hosts, ssh keys are exchanged using this password.
- Initially, the HAWQ system user will be created with this password.
- Afterwards, the password should be changed directly on the hosts first and then the updated value must be entered here.
+ <description>
+ Sets the HAWQ system user password. This password is used for ssh key exchange when initializing a cluster or provisioning a new host.
+ Set when the HAWQ system user is created.
+ When changing passwords after initial creation, first update the password directly on the hosts, then enter a new hawq_password value.
</description>
<value-attributes>
<type>password</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 cd3d329..341c1c1 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
@@ -21,7 +21,10 @@
<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>
+ <description>
+ Soft limit integer value for the maximum number of file handles or open files allowed for user gpadmin.
+ The default is 2900000. This value is set in the file /etc/security/limits.d/gpadmin.conf.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -32,7 +35,10 @@
<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>
+ <description>
+ Hard limit integer value for the maximum number of file handles or open files allowed for user gpadmin.
+ The default is 2900000. This value is set in the file /etc/security/limits.d/gpadmin.conf.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -43,7 +49,10 @@
<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>
+ <description>
+ Soft limit integer value for the maximum number of processes allowed for user gpadmin.
+ The default is 131072. This value is set in the file /etc/security/limits.d/gpadmin.conf
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -54,7 +63,10 @@
<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>
+ <description>
+ Hard limit integer value for the maximum number of processes allowed for user gpadmin.
+ The default is 131072. This value is set in the file /etc/security/limits.d/gpadmin.conf
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 474f509..d3aa0ed 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
@@ -34,7 +34,8 @@
<display-name>HAWQ Master Port</display-name>
<value>5432</value>
<description>
- The port number of HAWQ master.
+ The port used by HAWQ master.
+ The default is 5432.
</description>
<value-attributes>
<type>int</type>
@@ -47,7 +48,7 @@
<display-name>HAWQ Standby Master</display-name>
<value>localhost</value>
<description>
- The hostname of HAWQ standby.
+ The hostname of the HAWQ standby master. The standby master and master must reside on different hosts.
</description>
<value-attributes>
<type>componentHost</type>
@@ -59,7 +60,8 @@
<display-name>HAWQ Segment Port</display-name>
<value>40000</value>
<description>
- The port number of HAWQ segment.
+ The base port used by HAWQ segments.
+ The default is 40000.
</description>
<value-attributes>
<type>int</type>
@@ -100,7 +102,8 @@
<display-name>HAWQ Segment Directory</display-name>
<value>/data/hawq/segment</value>
<description>
- The directory of HAWQ segment.
+ The base path for the HAWQ segment data directory.
+ The default is /data/hawq/segment.
</description>
<value-attributes>
<type>directory</type>
@@ -114,7 +117,8 @@
<display-name>HAWQ Master Temp Directory</display-name>
<value>/tmp/hawq/master</value>
<description>
- The temporary directory reserved for HAWQ master.
+ One or more temporary directories reserved for the HAWQ master. Separate multiple entries with commas.
+ The default is /tmp/hawq/master.
</description>
<value-attributes>
<type>directory</type>
@@ -126,7 +130,8 @@
<display-name>HAWQ Segment Temp Directory</display-name>
<value>/tmp/hawq/segment</value>
<description>
- The temporary directory reserved for HAWQ segment.
+ One or more temporary directories reserved for the HAWQ segment. Separate multiple entries with commas.
+ The default is /tmp/hawq/segment.
</description>
<value-attributes>
<type>directory</type>
@@ -139,9 +144,10 @@
<display-name>Resource Manager</display-name>
<value>none</value>
<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.
+ HAWQ global resource manager type. Valid values are YARN ('yarn') and Native ('none').
+ Native('none') indicates that the HAWQ resource manager manages its own resources exclusively for the entire cluster.
+ YARN ('yarn') means that HAWQ will negotiate with YARN's resource manager for resources.
+ The default is Native ('none').
</description>
<value-attributes>
<type>value-list</type>
@@ -164,7 +170,8 @@
<display-name>Segment Memory Usage Limit</display-name>
<value>64GB</value>
<description>
- The limit of memory usage in a HAWQ segment when Resource Manager (hawq_global_rm_type) is set to Native ('none').
+ The maximum memory that can be used by a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to Native ('none').
+ The default is 64GB.
</description>
<value-attributes>
<type>string</type>
@@ -176,7 +183,8 @@
<display-name>Segment Virtual Core Usage Limit</display-name>
<value>16</value>
<description>
- The limit of virtual core usage in a HAWQ segment when Resource Manager (hawq_global_rm_type) is set to Native ('none').
+ The maximum number of virtual cores that can be used for query execution in a HAWQ segment when Resource Manager ('hawq_global_rm_type') is set to Native ('none').
+ The default is 16.
</description>
<value-attributes>
<type>int</type>
@@ -190,7 +198,9 @@
<name>hawq_rm_yarn_address</name>
<value>localhost:8032</value>
<description>
- The address of YARN resource manager server.
+ Server address (host and port) of the YARN Resource Manager server (the value of yarn.resourcemanager.address).
+ You must define this if Resource Manager ('hawq_global_rm_type') is set to YARN ('yarn').
+ The default is localhost:8032.
</description>
<depends-on>
<property>
@@ -208,7 +218,9 @@
<name>hawq_rm_yarn_scheduler_address</name>
<value>localhost:8030</value>
<description>
- The address of YARN scheduler server.
+ Server address (host and port) of the YARN resource manager scheduler (the value of yarn.resourcemanager.scheduler.address).
+ User must define this if Resource Manager ('hawq_global_rm_type') is set to YARN ('yarn').
+ The default is localhost:8030.
</description>
<depends-on>
<property>
@@ -226,7 +238,8 @@
<name>hawq_rm_yarn_queue_name</name>
<value>default</value>
<description>
- The YARN queue name to register HAWQ resource manager.
+ The name of the YARN queue to register with HAWQ's resource manager.
+ The default is 'default'.
</description>
<value-attributes>
<type>string</type>
@@ -237,7 +250,8 @@
<name>hawq_rm_yarn_app_name</name>
<value>hawq</value>
<description>
- The application name to register HAWQ resource manager in YARN.
+ The name of the YARN application to register with HAWQ's resource manager.
+ The default is 'hawq'.
</description>
<value-attributes>
<type>string</type>
@@ -248,7 +262,8 @@
<name>hawq_re_cpu_enable</name>
<value>false</value>
<description>
- The control to enable/disable CPU resource enforcement.
+ Determines whether to enable or disable CPU resource enforcement.
+ The default is false (disabled).
</description>
<value-attributes>
<type>boolean</type>
@@ -259,8 +274,9 @@
<name>hawq_re_cgroup_mount_point</name>
<value>/sys/fs/cgroup</value>
<description>
- The mount point of CGroup file system for resource enforcement.
- For example, /sys/fs/cgroup/cpu/hawq for CPU sub-system.
+ The mount point of CGroup file system for resource enforcement.
+ For example, /sys/fs/cgroup/cpu/hawq for CPU subsystem.
+ The default is '/sys/fs/cgroup'.
</description>
<value-attributes>
<type>directory</type>
@@ -271,8 +287,9 @@
<name>hawq_re_cgroup_hierarchy_name</name>
<value>hawq</value>
<description>
- The name of the hierarchy to accomodate CGroup directories/files for resource enforcement.
- For example, /sys/fs/cgroup/cpu/hawq for CPU sub-system.
+ The name of the hierarchy to accommodate CGroup directories/files for resource enforcement.
+ For example, /sys/fs/cgroup/cpu/hawq for CPU subsystem.
+ The default is 'hawq'.
</description>
<value-attributes>
<type>string</type>
@@ -284,8 +301,10 @@
<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.
+ The default is 24.
</description>
<value-attributes>
<type>int</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 3ca9e87..365fa86 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
@@ -18,9 +18,11 @@
<configuration supports_adding_forbidden="true">
<property>
<name>kernel.shmmax</name>
- <value>500000000</value>
- <description>Maximum size in bytes of a single shared memory segment that a Linux process can allocate in its
- virtual address space</description>
+ <value>1000000000</value>
+ <description>
+ The maximum size, in bytes, of a single shared memory segment that a Linux process can allocate in its virtual address space.
+ The default is 500000000.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -30,7 +32,10 @@
<property>
<name>kernel.shmmni</name>
<value>4096</value>
- <description>System wide maximum number of shared memory segments</description>
+ <description>
+ The maximum number of shared memory segments allowed system-wide.
+ The default is 4096.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -40,7 +45,10 @@
<property>
<name>kernel.shmall</name>
<value>4000000000</value>
- <description>Total amount of shared memory pages that can be used system wide</description>
+ <description>
+ The total number of shared memory pages that can be used system-wide.
+ The default is 4000000000.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -50,7 +58,10 @@
<property>
<name>kernel.sem</name>
<value>250 512000 100 2048</value>
- <description>Parameter to define semaphore related values</description>
+ <description>
+ Parameter used to define semaphore-related values.
+ The default is 250 512000 100 2048.
+ </description>
<value-attributes>
<type>string</type>
</value-attributes>
@@ -59,7 +70,11 @@
<property>
<name>kernel.sysrq</name>
<value>1</value>
- <description>Enable(1)/Disable(0) functions of sysrq</description>
+ <description>
+ Determines whether to enable or disable functions of sysrq.
+ Set to 1 to enable or 0 to disable.
+ The default is 1 (enabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -70,7 +85,11 @@
<property>
<name>kernel.core_uses_pid</name>
<value>1</value>
- <description>Enable appending process id to the name of core dump file. Ex: core.PID</description>
+ <description>
+ Determines whether to append the process ID to the name of the core dump file.
+ For example, core.PID. Set to 1 to enable or 0 to disable.
+ The default is 1 (enabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -81,7 +100,10 @@
<property>
<name>kernel.msgmnb</name>
<value>65536</value>
- <description>Default maximum size of a message in bytes</description>
+ <description>
+ The maximum size of a message, in bytes.
+ The default is 65336.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -91,7 +113,10 @@
<property>
<name>kernel.msgmax</name>
<value>65536</value>
- <description>Default maxmimum size of a mesage queue</description>
+ <description>
+ The maximum size of a message queue, in bytes.
+ The default is 65336.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -101,7 +126,10 @@
<property>
<name>kernel.msgmni</name>
<value>2048</value>
- <description>Number of message queue identifiers</description>
+ <description>
+ The maximum number of message queue identifiers.
+ The default is 2048.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -111,7 +139,11 @@
<property>
<name>net.ipv4.tcp_syncookies</name>
<value>0</value>
- <description>Enable(1)/Disable(0) SYN cookie protection</description>
+ <description>
+ Determines whether to enable or disable SYN cookie protection.
+ Set to 1 to enable or 0 to disable.
+ The default is 0 (disabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -122,7 +154,11 @@
<property>
<name>net.ipv4.ip_forward</name>
<value>0</value>
- <description>Enable(1)/Disable(0) IP forwarding</description>
+ <description>
+ Determines whether to enable or disable IP forwarding.
+ Set to 1 to enable or 0 to disable.
+ The default is 0 (disabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -133,7 +169,11 @@
<property>
<name>net.ipv4.conf.default.accept_source_route</name>
<value>0</value>
- <description>Enable(1)/Disable(0) IP source routing</description>
+ <description>
+ Determines whether to enable or disable IP source routing.
+ Set to 1 to enable or 0 to disable.
+ The default is 0 (disabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -144,7 +184,11 @@
<property>
<name>net.ipv4.tcp_tw_recycle</name>
<value>1</value>
- <description>Enable(1)/Disable(0) fast recycling of TIME_WAIT sockets</description>
+ <description>
+ Determines whether to enable or disable fast recycling of TIME_WAIT sockets.
+ Set to 1 to enable or 0 to disable.
+ The default is 1 (enabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -155,7 +199,10 @@
<property>
<name>net.ipv4.tcp_max_syn_backlog</name>
<value>200000</value>
- <description>Number of outstanding syn requests allowed</description>
+ <description>
+ The maximum number of outstanding syn requests allowed.
+ The default is 200000.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -165,7 +212,11 @@
<property>
<name>net.ipv4.conf.all.arp_filter</name>
<value>1</value>
- <description>Enable(1)/Disable(0) route lookup to determine the interface through which to send the reply</description>
+ <description>
+ Determines whether to enable or disable route lookup to select the interface for replies.
+ Set to 1 to enable or 0 to disable.
+ The default is 1 (enabled).
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -175,8 +226,11 @@
<property>
<name>net.ipv4.ip_local_port_range</name>
- <value>1281 65535</value>
- <description>Local port range that is used by TCP and UDP traffic to choose the local port</description>
+ <value>1025 65535</value>
+ <description>
+ The local port range, specified by two values separated by a space, used by TCP and UDP traffic when choosing the local port.
+ The default is 1281 65535.
+ </description>
<value-attributes>
<type>string</type>
</value-attributes>
@@ -185,7 +239,10 @@
<property>
<name>net.core.netdev_max_backlog</name>
<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>
+ <description>
+ The maximum number of packets allowed to queue when a particular interface receives packets faster than the kernel can process them.
+ The default is 200000.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -195,7 +252,10 @@
<property>
<name>fs.nr_open</name>
<value>3000000</value>
- <description>Maximum number of file-handles a process can allocate</description>
+ <description>
+ The maximum number of file handles that a process can allocate.
+ The default is 3000000.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -205,7 +265,10 @@
<property>
<name>kernel.threads-max</name>
<value>798720</value>
- <description>System-wide maximum number of threads to be used by the kernel at one time</description>
+ <description>
+ The maximum number of threads that can be used by the kernel at one time system-wide.
+ The default is 798720.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -215,7 +278,10 @@
<property>
<name>kernel.pid_max</name>
<value>798720</value>
- <description>Maximum number of unique process identifiers</description>
+ <description>
+ The maximum number of unique process identifiers.
+ The default is 798720.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -225,7 +291,10 @@
<property>
<name>net.core.rmem_max</name>
<value>2097152</value>
- <description>Maximum receive socket buffer size in bytes</description>
+ <description>
+ The maximum size of the receive socket buffer, in bytes.
+ The default is 2097152.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -235,7 +304,10 @@
<property>
<name>net.core.wmem_max</name>
<value>2097152</value>
- <description>Maximum send socket buffer size in bytes</description>
+ <description>
+ The maximum size of the send socket buffer, in bytes.
+ The default is 2097152.
+ </description>
<value-attributes>
<type>int</type>
<minimum>0</minimum>
@@ -246,7 +318,12 @@
<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>
+ Establishes the conditions for determining whether large memory requests are accepted or denied.
+ The three possible values for this parameter are: 0, 1 or 2.
+ For production environments, the value of 2 is recommended and means that processes will not be killed but will receive errors upon memory allocation.
+ The default value is 1.
+ </description>
<value-attributes>
<type>value-list</type>
<entries>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 7518c6b..de6f100 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
@@ -22,7 +22,8 @@
<name>rpc.client.timeout</name>
<value>3600000</value>
<description>
- The timeout interval of an RPC invocation, in milliseconds. The default is 3600000 (1 hour).
+ The timeout interval of an RPC invocation, in milliseconds.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -35,7 +36,8 @@
<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.
+ Determines whether TCP_NODELAY is used when connecting to the RPC server.
+ The default is true.
</description>
<value-attributes>
<type>boolean</type>
@@ -46,7 +48,8 @@
<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).
+ The maximum idle time for an RPC connection, in milliseconds.
+ The default is 10000 (10 seconds).
</description>
<value-attributes>
<type>int</type>
@@ -59,7 +62,8 @@
<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).
+ 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>
@@ -72,7 +76,8 @@
<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).
+ The timeout interval for establishing the RPC client connection, in milliseconds.
+ The default is 600000 (10 minutes).
</description>
<value-attributes>
<type>int</type>
@@ -85,7 +90,8 @@
<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.
+ 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>
@@ -97,7 +103,8 @@
<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).
+ 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>
@@ -110,7 +117,8 @@
<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).
+ 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>
@@ -123,7 +131,8 @@
<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.
+ 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>
@@ -134,7 +143,8 @@
<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.
+ 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>
@@ -145,7 +155,8 @@
<name>dfs.default.replica</name>
<value>3</value>
<description>
- The default number of replicas. The default value is 3.
+ The default number of replicas.
+ The default value is 3.
</description>
<value-attributes>
<type>int</type>
@@ -157,7 +168,8 @@
<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.
+ The number of blocks for which information is pre-fetched.
+ The default is 10.
</description>
<value-attributes>
<type>int</type>
@@ -169,7 +181,8 @@
<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.
+ The maximum number of times that the DFS client retries issuing a RPC call, when multiple NameNodes are configured.
+ The default is 15.
</description>
<value-attributes>
<type>int</type>
@@ -181,7 +194,8 @@
<name>dfs.default.blocksize</name>
<value>134217728</value>
<description>
- The default block size in bytes. The default is set to 134217728 (128 MB).
+ The default block size in bytes.
+ The default value is 134217728 (128 MB).
</description>
<value-attributes>
<type>int</type>
@@ -194,7 +208,8 @@
<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.
+ The minimal log severity level. Valid values include: FATAL, ERROR, INFO, DEBUG1, DEBUG2, and DEBUG3.
+ The default is INFO.
</description>
<value-attributes>
<type>value-list</type>
@@ -226,7 +241,8 @@
<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).
+ The timeout interval, in milliseconds, for when the input stream is setting up a connection to a DataNode.
+ The default is 600000 (10 minutes).
</description>
<value-attributes>
<type>int</type>
@@ -239,7 +255,8 @@
<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).
+ The timeout interval, in milliseconds, for when the input stream is reading from a DataNode.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -252,7 +269,8 @@
<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).
+ The timeout interval, in milliseconds, for when the input stream is writing to a DataNode.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -265,8 +283,9 @@
<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).
+ The size of the buffer, in bytes, used to hold data from the file block and verify the checksum.
+ This value is used only when 'dfs.client.read.shortcircuit' is set to true.
+ The default is 1048576 (1 MB).
</description>
<value-attributes>
<type>int</type>
@@ -279,7 +298,8 @@
<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.
+ The size of the file block path information cache, in bytes.
+ The default is 1000 bytes.
</description>
<value-attributes>
<type>int</type>
@@ -292,7 +312,8 @@
<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.
+ The maximum number of times the client should retry getting block information from the NameNode.
+ The default is 3.
</description>
<value-attributes>
<type>int</type>
@@ -304,7 +325,8 @@
<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.
+ Determines whether the client adds a new DataNode to pipeline if the number of nodes in the pipeline is less than the specified number of replicas.
+ The default is true.
</description>
<value-attributes>
<type>boolean</type>
@@ -315,7 +337,8 @@
<name>output.default.chunksize</name>
<value>512</value>
<description>
- The chunk size (in bytes) in the pipeline. The default is set to 512 bytes.
+ The chunk size of the pipeline, in bytes.
+ The default is 512 bytes.
</description>
<value-attributes>
<type>int</type>
@@ -328,7 +351,8 @@
<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).
+ The packet size of the pipeline, in bytes.
+ The default is 65536 (64 kB).
</description>
<value-attributes>
<type>int</type>
@@ -341,7 +365,8 @@
<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.
+ The maximum number of times that the client should reattempt to set up a failed pipeline.
+ The default is 10.
</description>
<value-attributes>
<type>int</type>
@@ -353,7 +378,8 @@
<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).
+ The timeout interval, in milliseconds, for when the output stream is setting up a connection to a DataNode.
+ The default is 600000 (10 minutes).
</description>
<value-attributes>
<type>int</type>
@@ -366,7 +392,8 @@
<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).
+ The timeout interval, in milliseconds, for when the output stream is reading from a DataNode.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -379,7 +406,8 @@
<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).
+ The timeout interval, in milliseconds, for when the output stream is writing to a DataNode.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -392,7 +420,8 @@
<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.
+ The maximum number of packets in a file's packet pool.
+ The default is 1024.
</description>
<value-attributes>
<type>int</type>
@@ -405,7 +434,8 @@
<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).
+ The timeout interval for closing an output stream, in milliseconds.
+ The default is 900000 (1.5 hour).
</description>
<value-attributes>
<type>int</type>
@@ -418,8 +448,8 @@
<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.
+ (Optional). The path to a UNIX domain socket to use for communication between the DataNode and local HDFS clients.
+ If the string "_PORT" is present in this path, it is replaced by the TCP port of the DataNode.
</description>
<value-attributes>
<type>directory</type>
@@ -430,8 +460,9 @@
<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.
+ Determines whether the legacy short-circuit reader implementation, based on HDFS-2246, is used.
+ Set this property to true on non-Linux platforms that do not have the new implementation based on HDFS-347.
+ The default is false.
</description>
<value-attributes>
<type>boolean</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/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 cd7e6be..6372392 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
@@ -23,7 +23,8 @@
<name>rpc.client.timeout</name>
<value>3600000</value>
<description>
- Timeout interval of a RPC invocation in millisecond. Default is 3600000.
+ The timeout interval, in milliseconds, of a RPC invocation.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -36,7 +37,8 @@
<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.
+ Determines whether to set socket TCP_NODELAY to true when connecting to RPC server.
+ The default is true.
</description>
<value-attributes>
<type>boolean</type>
@@ -60,7 +62,8 @@
<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.
+ Interval, in milliseconds, at which the RPC client sends a heartbeat to the server. Set this property to 0 to disable the heartbeat.
+ The default is 10000.
</description>
<value-attributes>
<type>int</type>
@@ -73,7 +76,8 @@
<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.
+ The timeout interval, in milliseconds, that the RPC client uses when trying to set up the connection.
+ The default is 600000.
</description>
<value-attributes>
<type>int</type>
@@ -86,7 +90,8 @@
<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.
+ The maximum number of times that the RPC client will retry after failing to set up the connection to the server.
+ The default is 10.
</description>
<value-attributes>
<type>int</type>
@@ -98,7 +103,8 @@
<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.
+ The timeout interval, in milliseconds, for when the RPC client is trying to read from the server.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -111,7 +117,8 @@
<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.
+ The timeout interval, in milliseconds, for when the RPC client is trying to write to the server.
+ The default is 3600000 (1 hour).
</description>
<value-attributes>
<type>int</type>
@@ -124,7 +131,8 @@
<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.
+ Determines the timeout interval to set for the socket SO_LINGER when connecting to the RPC server. A value of -1 means to use the default OS value.
+ The default is -1.
</description>
<value-attributes>
<type>int</type>
@@ -137,7 +145,8 @@
<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.
+ If multiple resource managers are configured, the maximum number of RPC calls that a yarn client will retry to issue.
+ The default is 15.
</description>
<value-attributes>
<type>int</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
index c87ce17..7ce0f71 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml
@@ -63,7 +63,9 @@ under the License.
<profiles>
<profile>
<name>HBase</name>
- <description>This profile is suitable for using when connecting to an HBase data store engine</description>
+ <description>
+ This profile is for HBase tables.
+ </description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hbase.HBaseDataFragmenter</fragmenter>
<accessor>org.apache.hawq.pxf.plugins.hbase.HBaseAccessor</accessor>
@@ -72,7 +74,9 @@ under the License.
</profile>
<profile>
<name>Hive</name>
- <description>This profile is suitable for using when connecting to Hive</description>
+ <description>
+ This profile can be used for Hive tables in any Hive-supported file storage format.
+ </description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hive.HiveDataFragmenter</fragmenter>
<accessor>org.apache.hawq.pxf.plugins.hive.HiveAccessor</accessor>
@@ -81,10 +85,10 @@ under the License.
</profile>
<profile>
<name>HiveRC</name>
- <description>This profile is suitable only for Hive tables stored in RC files
- and serialized with either the ColumnarSerDe or the LazyBinaryColumnarSerDe.
- It is much faster than the general purpose Hive profile.
- DELIMITER parameter is mandatory.
+ <description>
+ This profile is for Hive tables in RCFile format, serialized with either
+ ColumnarSerDe or LazyBinaryColumnarSerDe. It is much faster than the Hive profile.
+ The DELIMITER parameter is required.
</description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter</fragmenter>
@@ -94,9 +98,10 @@ under the License.
</profile>
<profile>
<name>HiveText</name>
- <description>This profile is suitable only for Hive tables stored as Text files.
- It is much faster than the general purpose Hive profile.
- DELIMITER parameter is mandatory.
+ <description>
+ This profile is for Hive tables stored in Text files.
+ It is much faster than the Hive profile.
+ The DELIMITER parameter is required.
</description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hive.HiveInputFormatFragmenter</fragmenter>
@@ -106,8 +111,8 @@ under the License.
</profile>
<profile>
<name>HdfsTextSimple</name>
- <description>This profile is suitable for using when reading delimited single line records from plain text files
- on HDFS
+ <description>
+ This profile is for reading delimited single-line records from text files in HDFS.
</description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hdfs.HdfsDataFragmenter</fragmenter>
@@ -117,8 +122,10 @@ under the License.
</profile>
<profile>
<name>HdfsTextMulti</name>
- <description>This profile is suitable for using when reading delimited single or multi line records (with quoted
- linefeeds) from plain text files on HDFS. It is not splittable (non parallel) and slower than HdfsTextSimple.
+ <description>
+ This profile is for reading delimited single-line records or multi-line records
+ (with quoted linefeeds) from text files in HDFS. It is not splittable
+ (non-parallel) and is slower than the HdfsTextSimple profile.
</description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hdfs.HdfsDataFragmenter</fragmenter>
@@ -128,7 +135,9 @@ under the License.
</profile>
<profile>
<name>Avro</name>
- <description>This profile is suitable for using when reading Avro files (i.e fileName.avro)</description>
+ <description>
+ This profile is for reading data stored in Avro files.
+ </description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hdfs.HdfsDataFragmenter</fragmenter>
<accessor>org.apache.hawq.pxf.plugins.hdfs.AvroFileAccessor</accessor>
@@ -138,8 +147,9 @@ under the License.
<profile>
<name>SequenceWritable</name>
<description>
- Profile for accessing Sequence files serialized with a custom Writable class
- usage: pxf://nn:50070/path/to/file?profile=SequenceWritable&data-schema=CustomClass
+ This profile is for Hadoop Sequence files serialized with a custom Writable
+ class. Provide the name of the custom class with the "data-schema" parameter.
+ For example: pxf://nn:51200/path-to-file?Profile=SequenceWritable&data-schema=CustomClass
</description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.hdfs.HdfsDataFragmenter</fragmenter>
@@ -149,7 +159,9 @@ under the License.
</profile>
<profile>
<name>GemFireXD</name>
- <description>This profile is suitable for using when connecting to GemFireXD</description>
+ <description>
+ This profile is for tables in GemFireXD.
+ </description>
<plugins>
<fragmenter>org.apache.hawq.pxf.plugins.gemfirexd.GemFireXDFragmenter</fragmenter>
<accessor>org.apache.hawq.pxf.plugins.gemfirexd.GemFireXDAccessor</accessor>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml
index 7b7e6c4..b104ee4 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-public-classpath.xml
@@ -24,7 +24,7 @@
<property>
<name>content</name>
- <description>PXF service's classpath file</description>
+ <description>Classpath file for the PXF service.</description>
<value>
#
# Licensed to the Apache Software Foundation (ASF) under one
@@ -46,11 +46,11 @@
#
##############################################################
-# This is PXF service's classpath file
-# Any connector should be added here, one resource per line.
-# e.g. /usr/lib/myconnector/myconnector.jar
-# Wildcard characters (*,[],?) are supported for the file names
-# e.g. /usr/lib/myconnector/*.jar
+# This is the classpath file for the PXF service.
+# Add connectors here, one resource per line, e.g.:
+# /usr/lib/myconnector/myconnector.jar
+# Wildcard characters (*,[],?) are supported for file names, e.g.:
+# /usr/lib/myconnector/*.jar
# /usr/lib/myconnector/myconnector*[0-9].jar
##############################################################
http://git-wip-us.apache.org/repos/asf/ambari/blob/c15b088c/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml
index 20ca06b..8ebd23e 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-site.xml
@@ -19,6 +19,8 @@
<property>
<name>pxf.service.kerberos.keytab</name>
<value>/etc/security/keytabs/pxf.service.keytab</value>
- <description>Path to keytab file owned by pxf service with permissions 0400</description>
+ <description>
+ Path to the PXF keytab file, owned by PXF service and with permissions 0400.
+ </description>
</property>
</configuration>