hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject incubator-hawq git commit: HAWQ-196. Unify GUCs and refine description for them in hawq-site.xml, template-hawq-site.xml and yarn-client.xml
Date Mon, 30 Nov 2015 08:37:43 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 150c8b4a7 -> 10074f8ce


HAWQ-196. Unify GUCs and refine description for them in hawq-site.xml, template-hawq-site.xml
and yarn-client.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/10074f8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/10074f8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/10074f8c

Branch: refs/heads/master
Commit: 10074f8ce2ad20693120c66ed4e312fb414b0cb7
Parents: 150c8b4
Author: Ruilong Huo <rhuo@pivotal.io>
Authored: Mon Nov 30 16:35:12 2015 +0800
Committer: Ruilong Huo <rhuo@pivotal.io>
Committed: Mon Nov 30 16:35:12 2015 +0800

----------------------------------------------------------------------
 src/backend/utils/misc/etc/hawq-site.xml        | 226 ++++++++++-------
 .../utils/misc/etc/template-hawq-site.xml       | 254 ++++++++++---------
 src/backend/utils/misc/etc/yarn-client.xml      |   4 +-
 src/backend/utils/misc/guc.c                    |  16 +-
 4 files changed, 266 insertions(+), 234 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/10074f8c/src/backend/utils/misc/etc/hawq-site.xml
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/etc/hawq-site.xml b/src/backend/utils/misc/etc/hawq-site.xml
index 8323c23..b327ab4 100644
--- a/src/backend/utils/misc/etc/hawq-site.xml
+++ b/src/backend/utils/misc/etc/hawq-site.xml
@@ -20,103 +20,133 @@ under the License.
 -->
 
 <configuration>
-    <property>
-        <name>hawq_master_address_host</name>
-        <value>localhost</value>
-        <description>The host name of hawq master.</description>
-    </property>
-
-    <property>
-        <name>hawq_master_address_port</name>
-        <value>5432</value>
-        <description>The port of hawq master.</description>
-    </property>
-
-    <property>
-        <name>hawq_segment_address_port</name>
-        <value>40000</value>
-        <description>The port of hawq segment.</description>
-    </property>
-
-    <property>
-        <name>hawq_dfs_url</name>
-        <value>localhost:8020/hawq_default</value>
-        <description>URL for accessing HDFS.</description>
-    </property>
-
-    <property>
-        <name>hawq_master_directory</name>
-        <value>~/hawq-data-directory/masterdd</value>
-        <description>The directory of hawq master.</description>
-    </property>
-
-    <property>
-        <name>hawq_segment_directory</name>
-        <value>~/hawq-data-directory/segmentdd</value>
-        <description>The directory of hawq segment.</description>
-    </property> 
-
-    <property>
-        <name>hawq_master_temp_directory</name>
-        <value>/tmp</value>
-        <description>The temporary directory reserved for hawq master.</description>
-    </property>
-
-    <property>
-        <name>hawq_segment_temp_directory</name>
-        <value>/tmp</value>
-        <description>The temporary directory reserved for hawq segment.</description>
-    </property>
+	<property>
+		<name>hawq_master_address_host</name>
+		<value>localhost</value>
+		<description>The host name of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_master_address_port</name>
+		<value>5432</value>
+		<description>The port of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_standby_address_host</name>
+		<value>none</value>
+		<description>The host name of hawq standby master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_address_port</name>
+		<value>40000</value>
+		<description>The port of hawq segment.</description>
+	</property>
+
+	<property>
+		<name>hawq_dfs_url</name>
+		<value>localhost:8020/hawq_default</value>
+		<description>URL for accessing HDFS.</description>
+	</property>
+
+	<property>
+		<name>hawq_master_directory</name>
+		<value>~/hawq-data-directory/masterdd</value>
+		<description>The directory of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_directory</name>
+		<value>~/hawq-data-directory/segmentdd</value>
+		<description>The directory of hawq segment.</description>
+	</property> 
+
+	<property>
+		<name>hawq_master_temp_directory</name>
+		<value>/tmp</value>
+		<description>The temporary directory reserved for hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_temp_directory</name>
+		<value>/tmp</value>
+		<description>The temporary directory reserved for hawq segment.</description>
+	</property>
      
-    <!-- HAWQ resource manager parameters -->
-    <property>
-        <name>hawq_global_rm_type</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>
-    </property>
-
-    <property>
-        <name>hawq_rm_memory_limit_perseg</name>
-        <value>64GB</value>
-        <description>The limit of memory usage in a hawq segment when 
-                     hawq_global_rm_type is set 'none'.
-        </description>
-    </property>
-
-    <property>
-        <name>hawq_rm_nvcore_limit_perseg</name>
-        <value>16</value>
-        <description>The limit of virtual core usage in a hawq segment when 
-                     hawq_global_rm_type is set 'none'.
-        </description>
-    </property>
-    
-    <property>
-        <name>hawq_rm_yarn_address</name>
-        <value>localhost:8032</value>
-        <description>The address of YARN resource manager server.</description>
-    </property>
-
-    <property>
-        <name>hawq_rm_yarn_scheduler_address</name>
-        <value>localhost:8030</value>
-        <description>The address of YARN scheduler server.</description>
-    </property>
-
-    <property>
-        <name>hawq_rm_yarn_queue_name</name>
-        <value>default</value>
-        <description>The YARN queue name to register hawq resource manager.</description>
-    </property>
-
-    <property>
-        <name>hawq_rm_yarn_app_name</name>
-        <value>hawq</value>
-        <description>The application name to register hawq resource manager in YARN.</description>
-    </property>
-
+	<!-- HAWQ resource manager parameters -->
+	<property>
+		<name>hawq_global_rm_type</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>
+	</property>
+
+	<property>
+		<name>hawq_rm_memory_limit_perseg</name>
+		<value>64GB</value>
+		<description>The limit of memory usage in a hawq segment when
+					 hawq_global_rm_type is set 'none'.
+		</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_nvcore_limit_perseg</name>
+		<value>16</value>
+		<description>The limit of virtual core usage in a hawq segment when
+					 hawq_global_rm_type is set 'none'.
+		</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_address</name>
+		<value>localhost:8032</value>
+		<description>The address of YARN resource manager server.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_scheduler_address</name>
+		<value>localhost:8030</value>
+		<description>The address of YARN scheduler server.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_queue_name</name>
+		<value>default</value>
+		<description>The YARN queue name to register hawq resource manager.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_app_name</name>
+		<value>hawq</value>
+		<description>The application name to register hawq resource manager in YARN.</description>
+	</property>
+	<!-- HAWQ resource manager parameters end here. -->
+
+	<!-- HAWQ resource enforcement parameters -->
+	<property>
+		<name>hawq_re_cpu_enable</name>
+		<value>false</value>
+		<description>The control to enable/disable CPU resource enforcement.</description>
+	</property>
+
+	<property>
+		<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.
+		</description>
+	</property>
+
+	<property>
+		<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.
+		</description>
+	</property>
+	<!-- HAWQ resource enforcement parameters end here. -->
 </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/10074f8c/src/backend/utils/misc/etc/template-hawq-site.xml
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/etc/template-hawq-site.xml b/src/backend/utils/misc/etc/template-hawq-site.xml
index d85d9d1..1d9380e 100644
--- a/src/backend/utils/misc/etc/template-hawq-site.xml
+++ b/src/backend/utils/misc/etc/template-hawq-site.xml
@@ -20,131 +20,133 @@ under the License.
 -->
 
 <configuration>
-    <property>
-        <name>hawq_master_address_host</name>
-        <value>%master.host%</value>
-    </property>
-
-    <property>
-        <name>hawq_master_address_port</name>
-        <value>%master.port%</value>
-    </property>
-
-    <property>
-        <name>hawq_standby_address_host</name>
-        <value>%standby.host%</value>
-    </property>
-
-    <property>
-        <name>hawq_segment_address_port</name>
-        <value>%segment.port%</value>
-    </property>
-
-    <property>
-        <name>hawq_dfs_url</name>
-        <value>%namenode.host%:%namenode.port%/%hawq.file.space%</value>
-    </property>
-
-    <property>
-        <name>hawq_master_directory</name>
-        <value>%master.directory%</value>
-    </property>
-
-    <property>
-        <name>hawq_segment_directory</name>
-        <value>%segment.directory%</value>
-    </property> 
-
-    <property>
-        <name>hawq_master_temp_directory</name>
-        <value>%master.temp.directory%</value>
-    </property>
-
-    <property>
-        <name>hawq_segment_temp_directory</name>
-        <value>%segment.temp.directory%</value>
-    </property>
+	<property>
+		<name>hawq_master_address_host</name>
+		<value>%master.host%</value>
+		<description>The host name of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_master_address_port</name>
+		<value>%master.port%</value>
+		<description>The port of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_standby_address_host</name>
+		<value>%standby.host%</value>
+		<description>The host name of hawq standby master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_address_port</name>
+		<value>%segment.port%</value>
+		<description>The port of hawq segment.</description>
+	</property>
+
+	<property>
+		<name>hawq_dfs_url</name>
+		<value>%namenode.host%:%namenode.port%/%hawq.file.space%</value>
+		<description>URL for accessing HDFS.</description>
+	</property>
+
+	<property>
+		<name>hawq_master_directory</name>
+		<value>%master.directory%</value>
+		<description>The directory of hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_directory</name>
+		<value>%segment.directory%</value>
+		<description>The directory of hawq segment.</description>
+	</property> 
+
+	<property>
+		<name>hawq_master_temp_directory</name>
+		<value>%master.temp.directory%</value>
+		<description>The temporary directory reserved for hawq master.</description>
+	</property>
+
+	<property>
+		<name>hawq_segment_temp_directory</name>
+		<value>%segment.temp.directory%</value>
+		<description>The temporary directory reserved for hawq segment.</description>
+	</property>
      
-    <!-- HAWQ resource manager parameters -->
-    <property>
-        <name>hawq_rm_yarn_address</name>
-        <value>%master.host%:9980</value>
-    </property>
-
-    <property>
-        <name>hawq_rm_yarn_scheduler_address</name>
-        <value>%master.host%:9981</value>
-    </property>
-
-    <property>
-        <name>hawq_global_rm_type</name>
-        <value>%enable_yarn%</value>
-    </property>
-
-    <property>
-        <name>hawq_resourcemanager_master_address_domainsocket_port</name>
-        <value>5436</value>
-    </property>
-    
-    <property>
-        <name>hawq_rm_master_port</name>
-        <value>5437</value>
-    </property>
-    
-    <property>
-        <name>hawq_rm_segment_port</name>
-        <value>5438</value>
-    </property>
-    
-    <property>
-        <name>hawq_rm_memory_limit_perseg</name>
-        <value>64GB</value>
-    </property>
-
-    <property>
-        <name>hawq_rm_nvcore_limit_perseg</name>
-        <value>16</value>
-    </property>
-    
-    <property>
-        <name>hawq_rm_yarn_queue_name</name>
-        <value>default</value>
-    </property>
-
-    <property>
-        <name>hawq_rm_yarn_app_name</name>
-        <value>hawq</value>
-    </property>
-
-    <!-- HAWQ resource enforcement parameters -->
-    <property>
-        <name>hawq_re_cpu_enable</name>
-        <value>false</value>
-    </property>
-
-    <property>
-        <name>hawq_re_cgroup_mount_point</name>
-        <value>/sys/fs/cgroup</value>
-    </property>
-    
-    <property>
-        <name>hawq_re_cgroup_hierarchy_name</name>
-        <value>hadoop-yarn</value>
-    </property>
-
-    <property>
-        <name>hawq_re_cleanup_period</name>
-        <value>180</value>
-    </property>
-    
-    <property>
-        <name>hawq_re_cpu_weight</name>
-        <value>1024.0</value>
-    </property>
-    
-    <property>
-        <name>hawq_re_vcore_pcore_ratio</name>
-        <value>1.0</value>
-    </property>
-    <!-- HAWQ resource enforcement parameters ends here. -->
+	<!-- HAWQ resource manager parameters -->
+	<property>
+		<name>hawq_global_rm_type</name>
+		<value>%enable_yarn%</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>
+	</property>
+
+	<property>
+		<name>hawq_rm_memory_limit_perseg</name>
+		<value>64GB</value>
+		<description>The limit of memory usage in a hawq segment when
+					 hawq_global_rm_type is set 'none'.
+		</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_nvcore_limit_perseg</name>
+		<value>16</value>
+		<description>The limit of virtual core usage in a hawq segment when
+					 hawq_global_rm_type is set 'none'.
+		</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_address</name>
+		<value>%master.host%:8032</value>
+		<description>The address of YARN resource manager server.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_scheduler_address</name>
+		<value>%master.host%:8030</value>
+		<description>The address of YARN scheduler server.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_queue_name</name>
+		<value>default</value>
+		<description>The YARN queue name to register hawq resource manager.</description>
+	</property>
+
+	<property>
+		<name>hawq_rm_yarn_app_name</name>
+		<value>hawq</value>
+		<description>The application name to register hawq resource manager in YARN.</description>
+	</property>
+	<!-- HAWQ resource manager parameters end here. -->
+
+	<!-- HAWQ resource enforcement parameters -->
+	<property>
+		<name>hawq_re_cpu_enable</name>
+		<value>false</value>
+		<description>The control to enable/disable CPU resource enforcement.</description>
+	</property>
+
+	<property>
+		<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.
+		</description>
+	</property>
+
+	<property>
+		<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.
+		</description>
+	</property>
+	<!-- HAWQ resource enforcement parameters end here. -->
 </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/10074f8c/src/backend/utils/misc/etc/yarn-client.xml
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/etc/yarn-client.xml b/src/backend/utils/misc/etc/yarn-client.xml
index 8255f85..d953bb4 100644
--- a/src/backend/utils/misc/etc/yarn-client.xml
+++ b/src/backend/utils/misc/etc/yarn-client.xml
@@ -32,11 +32,11 @@ KDC -->
 <!-- HA
 	<property>
 		<name>yarn.resourcemanager.ha</name>
-		<value>%RESOURCEMANAGER%:9980,%RESOURCEMANAGER2%:9980</value>
+		<value>%RESOURCEMANAGER%:8032,%RESOURCEMANAGER2%:8032</value>
 	</property>
 	<property>
 		<name>yarn.resourcemanager.scheduler.ha</name>
-		<value>%RESOURCEMANAGER%:9981,%RESOURCEMANAGER2%:9981</value>
+		<value>%RESOURCEMANAGER%:8030,%RESOURCEMANAGER2%:8030</value>
 	</property>
 HA -->
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/10074f8c/src/backend/utils/misc/guc.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index f7482c3..4a96fe3 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4420,7 +4420,7 @@ static struct config_bool ConfigureNamesBool[] =
 
 	{
 		{"hawq_re_cpu_enable", PGC_POSTMASTER, RESOURCES_MGM,
-		 gettext_noop("enable enforcing cpu resource consumption."),
+		 gettext_noop("Enables CPU sub-system for resource enforcement."),
 		 NULL
 		},
 		&rm_enforce_cpu_enable,
@@ -5982,7 +5982,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"hawq_re_memory_overcommit_max", PGC_POSTMASTER, RESOURCES_MEM,
-			gettext_noop("Maximum quota of memory overcommit (in MB) per HAWQ physical segment in
resource enforcement"),
+			gettext_noop("Sets the maximum quota of memory overcommit (in MB) per physical segment
for resource enforcement."),
 			NULL,
 		},
 		&hawq_re_memory_overcommit_max,
@@ -6412,7 +6412,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"hawq_re_cleanup_period", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("period for resource enforcer to cleanup cgroups."),
+			gettext_noop("Sets the time period (in Second) to clean up CGroup directories/files for
resource enforcement."),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
@@ -6890,7 +6890,7 @@ static struct config_real ConfigureNamesReal[] =
 
 	{
 		{"hawq_re_cpu_weight",PGC_POSTMASTER, RESOURCES_MGM,
-			gettext_noop("mapping of virtual cores from hawq to yarn"),
+			gettext_noop("Sets the weight to map virtual cores in HAWQ to virtual cores in YARN for
resource enforcement."),
 			NULL
 		},
 		&rm_enforce_cpu_weight,
@@ -6899,7 +6899,7 @@ static struct config_real ConfigureNamesReal[] =
 
 	{
 		{"hawq_re_vcore_pcore_ratio",PGC_POSTMASTER, RESOURCES_MGM,
-			gettext_noop("mapping from virtual cores to physical cores"),
+			gettext_noop("Sets the weight to map virtual cores to physical cores in HAWQ for resource
enforcement."),
 			NULL
 		},
 		&rm_enforce_core_vpratio,
@@ -8150,7 +8150,7 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"hawq_re_cgroup_mount_point", PGC_POSTMASTER, RESOURCES_MGM,
-			gettext_noop("set cgroup mount point for resource enforcement"),
+			gettext_noop("Sets the mount point of CGroup file system for resource enforcement."),
 			NULL
 		},
 		&rm_enforce_cgrp_mnt_pnt,
@@ -8159,11 +8159,11 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"hawq_re_cgroup_hierarchy_name", PGC_POSTMASTER, RESOURCES_MGM,
-			gettext_noop("set cgroup hierarchy name for resource enforcement"),
+			gettext_noop("Sets the name of the hierarchy to accomodate CGroup directories/files for
resource enforcement."),
 			NULL
 		},
 		&rm_enforce_cgrp_hier_name,
-		"hadoop-yarn", NULL, NULL
+		"hawq", NULL, NULL
 	},
 
 	{


Mime
View raw message