You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by yj...@apache.org on 2015/10/30 03:09:44 UTC
incubator-hawq git commit: HAWQ-111. Rename guc variable names
Repository: incubator-hawq
Updated Branches:
refs/heads/master 8239aec78 -> 1d0840b47
HAWQ-111. Rename guc variable names
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/1d0840b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/1d0840b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/1d0840b4
Branch: refs/heads/master
Commit: 1d0840b474f7bc5f28a1fb81ee6803adb5cb7811
Parents: 8239aec
Author: Yi Jin <yj...@pivotal.io>
Authored: Fri Oct 30 10:09:14 2015 +0800
Committer: Yi Jin <yj...@pivotal.io>
Committed: Fri Oct 30 10:09:14 2015 +0800
----------------------------------------------------------------------
src/backend/cdb/cdbvars.c | 42 +++++-----
.../communication/rmcomm_QD2RM.c | 2 +-
src/backend/resourcemanager/include/dynrm.h | 17 ++--
.../resourcemanager/requesthandler_ddl.c | 4 +-
src/backend/resourcemanager/resourcemanager.c | 8 +-
src/backend/resourcemanager/resqueuemanager.c | 35 ++++----
src/backend/utils/misc/etc/hawq-site.xml | 12 +--
.../utils/misc/etc/template-hawq-site.xml | 29 +++----
src/backend/utils/misc/guc.c | 86 ++++++++++----------
src/include/cdb/cdbvars.h | 12 +--
tools/bin/gpmigrator | 4 +-
11 files changed, 118 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/cdb/cdbvars.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index 93b823f..15b6254 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -312,31 +312,30 @@ int rm_nslice_perseg_limit;
char *rm_seg_memory_use;
double rm_seg_core_use;
-
-
char *rm_global_rm_type;
char *rm_grm_yarn_rm_addr;
char *rm_grm_yarn_sched_addr;
char *rm_grm_yarn_queue;
char *rm_grm_yarn_app_name;
-int rm_grm_breath_return_percentage;
+int rm_return_percentage_on_overcommit;
+int rm_cluster_report_period;
char *rm_stmt_vseg_mem_str;
int rm_stmt_nvseg;
-int rm_seg_container_default_waterlevel;
+int rm_min_resource_perseg;
bool rm_force_fifo_queue;
bool rm_session_lease_heartbeat_enable;
int rm_session_lease_timeout; /* How many seconds to wait before expiring
- allocated resource. */
-int rm_query_resource_noresource_timeout; /* How may seconds to wait before
- expiring queuing query resource
- request. */
+ allocated resource. */
+int rm_resource_allocation_timeout; /* How may seconds to wait before
+ expiring queuing query resource
+ request. */
int rm_resource_timeout; /* How many seconds to wait before returning
resource back to the resource broker. */
-int rm_resource_heartbeat_interval; /* How many seconds to wait before sending
- another heart-beat to resource manager. */
+int rm_session_lease_heartbeat_interval; /* How many seconds to wait before sending
+ another heart-beat to resource manager. */
int rm_tolerate_nseg_limit;
int rm_rejectrequest_nseg_limit;
@@ -344,21 +343,20 @@ int rm_nvseg_variance_among_seg_limit;
char *rm_resourcepool_test_filename;
-bool rm_enforce_cpu_enable; /* hawq_resourceenforcer_cpu_enable */
-char *rm_enforce_cgrp_mnt_pnt; /* hawq_resourceenforcer_cgroup_mount_point */
-char *rm_enforce_cgrp_hier_name; /* hawq_resourceenforcer_cgroup_hierarchy_name */
-double rm_enforce_cpu_weight; /* hawq_resourceenforcer_cpu_weight */
-double rm_enforce_core_vpratio; /* hawq_resourceenforcer_vcore_pcore_ratio */
-int rm_enforce_cleanup_period; /* hawq_resourceenforcer_cleanup_period */
+bool rm_enforce_cpu_enable;
+char *rm_enforce_cgrp_mnt_pnt;
+char *rm_enforce_cgrp_hier_name;
+double rm_enforce_cpu_weight;
+double rm_enforce_core_vpratio;
+int rm_enforce_cleanup_period;
-int rm_allocation_policy; /* hawq_resourcemanager_allocation_policy */
+int rm_allocation_policy;
-char *rm_tmp_dirs; /* hawq.resourcemanager.tempdirs */
-char *rm_master_tmp_dirs; /* hawq.master.temp.directory */
-char *rm_seg_tmp_dirs; /* hawq.segment.temp.directory */
+char *rm_master_tmp_dirs;
+char *rm_seg_tmp_dirs;
-int rm_log_level; /* hawq.reourcemanager.log.level */
-int rm_max_resource_queue_number; /* hawq_reourcemanager_max_resourcequeue_number */
+int rm_log_level;
+int rm_nresqueue_limit;
/* Greenplum Database Experimental Feature GUCs */
int gp_distinct_grouping_sets_threshold = 32;
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/communication/rmcomm_QD2RM.c b/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
index 7881e9f..cffdec9 100644
--- a/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
+++ b/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
@@ -1294,7 +1294,7 @@ void *generateResourceRefreshHeartBeat(void *arg)
}
closeConnectionRemote(&fd);
}
- pg_usleep(rm_resource_heartbeat_interval * 1000000);
+ pg_usleep(rm_session_lease_heartbeat_interval * 1000000);
}
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/resourcemanager/include/dynrm.h
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/include/dynrm.h b/src/backend/resourcemanager/include/dynrm.h
index 57ac34d..baea73d 100644
--- a/src/backend/resourcemanager/include/dynrm.h
+++ b/src/backend/resourcemanager/include/dynrm.h
@@ -254,8 +254,8 @@ int refreshGlobalRMClusterInformation(void);
#define HAWQDRM_CONFFILE_TEST_CONF_FILE "hawq_resourcemanager_test_configure_filename"
#define HAWQDRM_CONFFILE_TEST_QUEUSR_FILE "hawq_resourcemanager_test_queueuser_filename"
-#define HAWQDRM_CONFFILE_LIMIT_MEMORY_USE "hawq_resourcemanager_segment_limit_memory_use"
-#define HAWQDRM_CONFFILE_LIMIT_CORE_USE "hawq_resourcemanager_segment_limit_core_use"
+#define HAWQDRM_CONFFILE_LIMIT_MEMORY_USE "hawq_rm_memory_limit_perseg"
+#define HAWQDRM_CONFFILE_LIMIT_CORE_USE "hawq_rm_nvcore_limit_perseg"
#define HAWQDRM_CONFFILE_HOSTNAMES_ALL "hawq_resourcemanager_hostnames_all"
#define HAWQDRM_CONFFILE_HOSTNAMES_BLACK "hawq_resourcemanager_hostnames_black"
@@ -265,17 +265,12 @@ int refreshGlobalRMClusterInformation(void);
#define HAWQ_CONFFILE_MASTER_ADDR_PORT "hawq_resourcemanager_master_address_port"
#define HAWQ_CONFFILE_STANDBY_ADDR "hawq_resourcemanager_standby_address"
#define HAWQ_CONFFILE_SEGMENT_PORT "hawq_resourcemanager_segment_port"
-#define HAWQ_CONFFILE_TEMPDIRS "hawq_resourcemanager_tempdirs"
-
-#define HAWQ_CONFFILE_RESOURCE_ENFORCER_CPU_FLAG "hawq_resourceenforcer_cpu_enabled"
-#define HAWQ_CONFFILE_RESOURCE_ENFORCER_CGROUP_MOUNT_POINT "hawq_resourceenforcer_cgroup_mount_point"
-#define HAWQ_CONFFILE_RESOURCE_ENFORCER_CGROUP_HIERARCHY_NAME "hawq_resourceenforcer_cgroup_hierarchy_name"
/* Property for libYarn */
-#define HAWQDRM_CONFFILE_YARN_SERVERADDR "hawq_resourcemanager_yarn_resourcemanager_address"
-#define HAWQDRM_CONFFILE_YARN_SCHEDULERADDR "hawq_resourcemanager_yarn_resourcemanager_scheduler_address"
-#define HAWQDRM_CONFFILE_YARN_QUEUE "hawq_resourcemanager_yarn_queue"
-#define HAWQDRM_CONFFILE_YARN_APP_NAME "hawq_resourcemanager_yarn_application_name"
+#define HAWQDRM_CONFFILE_YARN_SERVERADDR "hawq_rm_yarn_address"
+#define HAWQDRM_CONFFILE_YARN_SCHEDULERADDR "hawq_rm_yarn_scheduler_address"
+#define HAWQDRM_CONFFILE_YARN_QUEUE "hawq_rm_yarn_queue_name"
+#define HAWQDRM_CONFFILE_YARN_APP_NAME "hawq_rm_yarn_app_name"
#define HAWQDRM_CONFFILE_SVRTYPE_VAL_YARN "yarn"
#define HAWQDRM_CONFFILE_SVRTYPE_VAL_MESOS "mesos"
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/resourcemanager/requesthandler_ddl.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/requesthandler_ddl.c b/src/backend/resourcemanager/requesthandler_ddl.c
index 773677b..839bc83 100644
--- a/src/backend/resourcemanager/requesthandler_ddl.c
+++ b/src/backend/resourcemanager/requesthandler_ddl.c
@@ -187,12 +187,12 @@ bool handleRMDDLRequestManipulateResourceQueue(void **arg)
{
case MANIPULATE_RESQUEUE_CREATE:
/* Resource queue number check. */
- if (list_length(PQUEMGR->Queues) >= rm_max_resource_queue_number)
+ if (list_length(PQUEMGR->Queues) >= rm_nresqueue_limit)
{
ddlres = RESQUEMGR_EXCEED_MAX_QUEUE_NUMBER;
snprintf(errorbuf, sizeof(errorbuf),
"exceed maximum resource queue number %d",
- rm_max_resource_queue_number);
+ rm_nresqueue_limit);
elog(WARNING, "Resource manager can not create resource queue "
"because %s",
errorbuf);
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/resourcemanager/resourcemanager.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resourcemanager.c b/src/backend/resourcemanager/resourcemanager.c
index 742c665..9b5e667 100644
--- a/src/backend/resourcemanager/resourcemanager.c
+++ b/src/backend/resourcemanager/resourcemanager.c
@@ -2019,7 +2019,7 @@ int generateAllocRequestToBroker(void)
}
/* Decide water level of resource. */
- int wlevel = hasWorkload ? rm_seg_container_default_waterlevel : 0;
+ int wlevel = hasWorkload ? rm_min_resource_perseg : 0;
switch( DRMGlobalInstance->ImpType )
{
case YARN_LIBYARN:
@@ -2591,7 +2591,8 @@ void processResourceBrokerTasks(void)
*/
curtime = gettime_microsec();
- if ( (curtime - PRESPOOL->LastUpdateTime > 60LL * 1000000LL ||
+ if ( (curtime - PRESPOOL->LastUpdateTime >
+ rm_cluster_report_period * 1000000LL ||
hasSegmentGRMCapacityNotUpdated() ) &&
curtime - PRESPOOL->LastRequestTime > 5LL * 1000000LL)
{
@@ -2614,7 +2615,8 @@ void processResourceBrokerTasks(void)
if ( PRESPOOL->AddPendingContainerCount == 0 &&
PRESPOOL->RetPendingContainerCount == 0 &&
- (curtime - PRESPOOL->LastCheckContainerTime > 60LL * 1000000LL) &&
+ (curtime - PRESPOOL->LastCheckContainerTime >
+ rm_cluster_report_period * 1000000LL) &&
(curtime - PRESPOOL->LastRequestContainerTime > 5LL * 1000000LL) )
{
List *report = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/resourcemanager/resqueuemanager.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resqueuemanager.c b/src/backend/resourcemanager/resqueuemanager.c
index 75dcece..4315daf 100644
--- a/src/backend/resourcemanager/resqueuemanager.c
+++ b/src/backend/resourcemanager/resqueuemanager.c
@@ -4426,7 +4426,7 @@ void timeoutQueuedRequest(void)
curmsec,
curmsec - ct->ConnectTime);
- if ( curmsec - ct->ConnectTime > 1000000L * rm_query_resource_noresource_timeout )
+ if ( curmsec - ct->ConnectTime > 1000000L * rm_resource_allocation_timeout )
{
elog(WARNING, "Waiting request timeout is detected due to no "
"available cluster.");
@@ -4496,13 +4496,13 @@ void timeoutQueuedRequest(void)
if ( ( (PQUEMGR->RootTrack->ClusterSegNumberMax == 0) &&
(curmsec - curcon->ResRequestTime >
- 1000000L * rm_query_resource_noresource_timeout ) ) ||
+ 1000000L * rm_resource_allocation_timeout ) ) ||
( (PQUEMGR->RatioTrackers[index]->TotalPendingStartTime > 0) &&
(curmsec - PQUEMGR->RatioTrackers[index]->TotalPendingStartTime >
- 1000000L * rm_query_resource_noresource_timeout) &&
+ 1000000L * rm_resource_allocation_timeout) &&
(curcon->HeadQueueTime > 0) &&
(curmsec - curcon->HeadQueueTime >
- 1000000L * rm_query_resource_noresource_timeout) ) )
+ 1000000L * rm_resource_allocation_timeout) ) )
{
elog(LOG, "The queued resource request no resource timeout is "
"detected. ConnID %d",
@@ -4513,7 +4513,7 @@ void timeoutQueuedRequest(void)
/* Case 3. Check if resource fragment problem lasts too long time. */
if ( curcon->troubledByFragment &&
curmsec - curcon->troubledByFragmentTimestamp >
- 1000000L * rm_query_resource_noresource_timeout &&
+ 1000000L * rm_resource_allocation_timeout &&
((DynResourceQueueTrack)(curcon->QueueTrack))->NumOfRunningQueries == 0 )
{
elog(LOG, "The queued resource request timeout is detected due to "
@@ -4530,7 +4530,7 @@ void timeoutQueuedRequest(void)
*/
if ( (curcon->HeadQueueTime > 0) &&
(curmsec - curcon->HeadQueueTime >
- 1000000L * rm_query_resource_noresource_timeout) &&
+ 1000000L * rm_resource_allocation_timeout) &&
(curcon->SegNumMin * curcon->SegMemoryMB >
((DynResourceQueueTrack)curcon->QueueTrack)->ClusterMemoryMaxMB) )
{
@@ -4595,10 +4595,8 @@ void resetAllDeadLockDetector(void)
void getIdleResourceRequest(int32_t *mem, double *core)
{
- *mem = PRESPOOL->MemCoreRatio * PRESPOOL->AvailNodeCount *
- rm_seg_container_default_waterlevel;
- *core = 1.0 * PRESPOOL->AvailNodeCount *
- rm_seg_container_default_waterlevel;
+ *mem = PRESPOOL->MemCoreRatio * PRESPOOL->AvailNodeCount * rm_min_resource_perseg;
+ *core = 1.0 * PRESPOOL->AvailNodeCount * rm_min_resource_perseg;
}
void setForcedReturnGRMContainerCount(void)
@@ -4637,18 +4635,13 @@ void setForcedReturnGRMContainerCount(void)
r,
clusterctnsize);
toretctnsize = ceil(r * clusterctnsize);
- }
- else
- {
- if ( rm_grm_breath_return_percentage > 0 )
+
+ if ( rm_return_percentage_on_overcommit > 0 )
{
- double r = 1.0 * clusterctnsize * rm_grm_breath_return_percentage / 100;
- toretctnsize = ceil(r);
- elog(DEBUG3, "GRM queue cur capacity %lf is not larger than capacity %lf. "
- "Calculated r %lf",
- PQUEMGR->GRMQueueCurCapacity,
- PQUEMGR->GRMQueueCapacity,
- r);
+ double r = 1.0 * clusterctnsize * rm_return_percentage_on_overcommit / 100;
+ int toretctnsize2 = ceil(r);
+ elog(DEBUG3, "Calculated r %lf based on return percentage.", r);
+ toretctnsize = toretctnsize < toretctnsize2 ? toretctnsize : toretctnsize2;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/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 6f7a748..97aa45b 100644
--- a/src/backend/utils/misc/etc/hawq-site.xml
+++ b/src/backend/utils/misc/etc/hawq-site.xml
@@ -60,7 +60,7 @@
</property>
<property>
- <name>hawq_resourcemanager_segment_limit_memory_use</name>
+ <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'.
@@ -68,7 +68,7 @@
</property>
<property>
- <name>hawq_resourcemanager_segment_limit_core_use</name>
+ <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'.
@@ -76,25 +76,25 @@
</property>
<property>
- <name>hawq_resourcemanager_yarn_resourcemanager_address</name>
+ <name>hawq_rm_yarn_address</name>
<value>localhost:8032</value>
<description>The address of YARN resource manager server.</description>
</property>
<property>
- <name>hawq_resourcemanager_yarn_resourcemanager_scheduler_address</name>
+ <name>hawq_rm_yarn_scheduler_address</name>
<value>localhost:8030</value>
<description>The address of YARN scheduler server.</description>
</property>
<property>
- <name>hawq_resourcemanager_yarn_queue</name>
+ <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_resourcemanager_yarn_application_name</name>
+ <name>hawq_rm_yarn_app_name</name>
<value>hawq</value>
<description>The application name to register hawq resource manager in YARN.</description>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/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 ac80f69..21e1fd3 100644
--- a/src/backend/utils/misc/etc/template-hawq-site.xml
+++ b/src/backend/utils/misc/etc/template-hawq-site.xml
@@ -47,12 +47,12 @@
<!-- HAWQ resource manager parameters -->
<property>
- <name>hawq_resourcemanager_yarn_resourcemanager_address</name>
+ <name>hawq_rm_yarn_address</name>
<value>%master.host%:9980</value>
</property>
<property>
- <name>hawq_resourcemanager_yarn_resourcemanager_scheduler_address</name>
+ <name>hawq_rm_yarn_scheduler_address</name>
<value>%master.host%:9981</value>
</property>
@@ -77,58 +77,53 @@
</property>
<property>
- <name>hawq_resourcemanager_segment_limit_memory_use</name>
+ <name>hawq_rm_memory_limit_perseg</name>
<value>64GB</value>
</property>
<property>
- <name>hawq_resourcemanager_segment_limit_core_use</name>
+ <name>hawq_rm_nvcore_limit_perseg</name>
<value>16</value>
</property>
<property>
- <name>hawq_resourcemanager_yarn_queue</name>
+ <name>hawq_rm_yarn_queue_name</name>
<value>default</value>
</property>
<property>
- <name>hawq_resourcemanager_yarn_application_name</name>
+ <name>hawq_rm_yarn_app_name</name>
<value>hawq</value>
</property>
- <property>
- <name>hawq_resourcemanager_log_level</name>
- <value>10</value>
- </property>
-
<!-- HAWQ resource enforcement parameters -->
<property>
- <name>hawq_resourceenforcer_cpu_enable</name>
+ <name>hawq_re_cpu_enable</name>
<value>false</value>
</property>
<property>
- <name>hawq_resourceenforcer_cgroup_mount_point</name>
+ <name>hawq_re_cgroup_mount_point</name>
<value>/sys/fs/cgroup</value>
</property>
<property>
- <name>hawq_resourceenforcer_cgroup_hierarchy_name</name>
+ <name>hawq_re_cgroup_hierarchy_name</name>
<value>hadoop-yarn</value>
</property>
<property>
- <name>hawq_resourceenforcer_cleanup_period</name>
+ <name>hawq_re_cleanup_period</name>
<value>180</value>
</property>
<property>
- <name>hawq_resourceenforcer_cpu_weight</name>
+ <name>hawq_re_cpu_weight</name>
<value>1024.0</value>
</property>
<property>
- <name>hawq_resourceenforcer_vcore_pcore_ratio</name>
+ <name>hawq_re_vcore_pcore_ratio</name>
<value>1.0</value>
</property>
<!-- HAWQ resource enforcement parameters ends here. -->
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/backend/utils/misc/guc.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a533cff..b4cceaa 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4406,7 +4406,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"hawq_resourceenforcer_cpu_enable", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_re_cpu_enable", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("enable enforcing cpu resource consumption."),
NULL
},
@@ -4434,8 +4434,8 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"hawq_resourcemanager_force_fifo_queue", PGC_POSTMASTER, RESOURCES_MGM,
- gettext_noop("force to execute query in queue in a fifo way."),
+ {"hawq_rm_force_fifo_queuing", PGC_POSTMASTER, RESOURCES_MGM,
+ gettext_noop("force to execute query in queue in a fifo sequence."),
NULL
},
&rm_force_fifo_queue,
@@ -6326,8 +6326,8 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_log_level", PGC_USERSET, DEVELOPER_OPTIONS,
- gettext_noop("set resource manager related log level."),
+ {"hawq_rm_log_level", PGC_USERSET, DEVELOPER_OPTIONS,
+ gettext_noop("set resource manager related log level"),
NULL,
GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
},
@@ -6336,14 +6336,24 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_breath_percentage", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_return_percent_on_overcommit", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("segment resource manager server address port number"),
NULL
},
- &rm_grm_breath_return_percentage,
+ &rm_return_percentage_on_overcommit,
10, 0, 100, NULL, NULL
},
+ {
+ {"hawq_rm_cluster_report_period", PGC_POSTMASTER, RESOURCES_MGM,
+ gettext_noop("interval of periodically getting global resource manager "
+ "cluster report"),
+ NULL
+ },
+ &rm_cluster_report_period,
+ 60, 10, 100, NULL, NULL
+ },
+
//cdbdatalocality
{
{"max_filecount_notto_split_segment", PGC_USERSET, DEVELOPER_OPTIONS,
@@ -6387,7 +6397,7 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourceenforcer_cleanup_period", PGC_USERSET, DEVELOPER_OPTIONS,
+ {"hawq_re_cleanup_period", PGC_USERSET, DEVELOPER_OPTIONS,
gettext_noop("period for resource enforcer to cleanup cgroups."),
NULL,
GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
@@ -6397,8 +6407,8 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_allocation_policy", PGC_USERSET, DEVELOPER_OPTIONS,
- gettext_noop("resource manager allocation policy."),
+ {"hawq_rm_respool_alloc_policy", PGC_USERSET, DEVELOPER_OPTIONS,
+ gettext_noop("resource manager allocation policy index."),
NULL,
GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
},
@@ -6445,13 +6455,13 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_segment_container_waterlevel", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_min_resource_perseg", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("the least water level of the number of global resource "
"manager containers in one segment when the workload is "
"not zero."),
NULL
},
- &rm_seg_container_default_waterlevel,
+ &rm_min_resource_perseg,
2, 0, 65535, NULL, NULL
},
@@ -6466,17 +6476,17 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_query_noresource_timeout", PGC_POSTMASTER, RESOURCES_MGM,
- gettext_noop("timeout for closing active connection for resource negotiation."),
+ {"hawq_rm_resource_allocation_timeout", PGC_POSTMASTER, RESOURCES_MGM,
+ gettext_noop("timeout for closing queued connection for resource allocation request."),
NULL
},
- &rm_query_resource_noresource_timeout,
+ &rm_resource_allocation_timeout,
600, 1, 65535, NULL, NULL
},
{
- {"hawq_resourcemanager_resource_timeout", PGC_POSTMASTER, RESOURCES_MGM,
- gettext_noop("timeout for returning resource back to resource broker."),
+ {"hawq_rm_resource_idle_timeout", PGC_POSTMASTER, RESOURCES_MGM,
+ gettext_noop("timeout for returning resource back to global resource manager."),
NULL
},
&rm_resource_timeout,
@@ -6484,11 +6494,12 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_resourcemanager_resource_heartbeat_interval", PGC_POSTMASTER, RESOURCES_MGM,
- gettext_noop("interval for sending heart-beat to resource manager to keep resource context alive."),
+ {"hawq_rm_session_lease_heartbeat_interval", PGC_POSTMASTER, RESOURCES_MGM,
+ gettext_noop("interval for sending heart-beat to resource manager to keep "
+ "resource context alive."),
NULL
},
- &rm_resource_heartbeat_interval,
+ &rm_session_lease_heartbeat_interval,
1, 1, 65535, NULL, NULL
},
@@ -6523,11 +6534,11 @@ static struct config_int ConfigureNamesInt[] =
},
{
- {"hawq_reourcemanager_max_resourcequeue_number", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_nresqueue_limit", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("the maximum number of resource queue."),
NULL
},
- &rm_max_resource_queue_number,
+ &rm_nresqueue_limit,
128, 3, 1024, NULL, NULL
},
@@ -6855,7 +6866,7 @@ static struct config_real ConfigureNamesReal[] =
},
{
- {"hawq_resourcemanager_segment_limit_core_use",PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_nvcore_limit_perseg",PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set number of cores can be used for HAWQ execution in one segment host"),
NULL
},
@@ -6864,7 +6875,7 @@ static struct config_real ConfigureNamesReal[] =
},
{
- {"hawq_resourceenforcer_cpu_weight",PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_re_cpu_weight",PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("mapping of virtual cores from hawq to yarn"),
NULL
},
@@ -6873,7 +6884,7 @@ static struct config_real ConfigureNamesReal[] =
},
{
- {"hawq_resourceenforcer_vcore_pcore_ratio",PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_re_vcore_pcore_ratio",PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("mapping from virtual cores to physical cores"),
NULL
},
@@ -8052,7 +8063,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_segment_limit_memory_use", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_memory_limit_perseg", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set memory can be used for execution in one segment host"),
NULL
},
@@ -8070,7 +8081,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_yarn_resourcemanager_address", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_yarn_address", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set yarn resource manager server address"),
NULL
},
@@ -8079,7 +8090,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_yarn_resourcemanager_scheduler_address", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_yarn_scheduler_address", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set yarn resource manager scheduler server address"),
NULL
},
@@ -8088,7 +8099,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_yarn_queue", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_yarn_queue_name", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set yarn resource manager target queue name"),
NULL
},
@@ -8097,7 +8108,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_yarn_application_name", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_yarn_app_name", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set yarn resource manager application name"),
NULL
},
@@ -8106,7 +8117,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_resourcepool_test_filename", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_rm_respool_test_file", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set host filename for resourcepool testing."),
NULL
},
@@ -8124,7 +8135,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourceenforcer_cgroup_mount_point", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_re_cgroup_mount_point", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set cgroup mount point for resource enforcement"),
NULL
},
@@ -8133,7 +8144,7 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourceenforcer_cgroup_hierarchy_name", PGC_POSTMASTER, RESOURCES_MGM,
+ {"hawq_re_cgroup_hierarchy_name", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("set cgroup hierarchy name for resource enforcement"),
NULL
},
@@ -8142,15 +8153,6 @@ static struct config_string ConfigureNamesString[] =
},
{
- {"hawq_resourcemanager_tempdirs", PGC_POSTMASTER, RESOURCES_MGM,
- gettext_noop("resource manager temporary directories"),
- NULL
- },
- &rm_tmp_dirs,
- "/tmp", NULL, NULL
- },
-
- {
{"hawq_master_temp_directory", PGC_POSTMASTER, RESOURCES_MGM,
gettext_noop("master temporary directories"),
NULL
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/src/include/cdb/cdbvars.h
----------------------------------------------------------------------
diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h
index 5e2ce36..e7c0a87 100644
--- a/src/include/cdb/cdbvars.h
+++ b/src/include/cdb/cdbvars.h
@@ -1169,7 +1169,8 @@ extern char *rm_grm_yarn_rm_addr;
extern char *rm_grm_yarn_sched_addr;
extern char *rm_grm_yarn_queue;
extern char *rm_grm_yarn_app_name;
-extern int rm_grm_breath_return_percentage;
+extern int rm_return_percentage_on_overcommit;
+extern int rm_cluster_report_period;
extern char *rm_stmt_vseg_mem_str;
extern int rm_stmt_nvseg;
@@ -1177,14 +1178,14 @@ extern int rm_stmt_nvseg;
extern int rm_nvseg_perquery_limit;
extern int rm_nvseg_perquery_perseg_limit;
extern int rm_nslice_perseg_limit;
-extern int rm_seg_container_default_waterlevel;
+extern int rm_min_resource_perseg;
extern int rm_session_lease_timeout;
extern bool rm_session_lease_heartbeat_enable;
-extern int rm_query_resource_noresource_timeout;
+extern int rm_resource_allocation_timeout;
extern int rm_resource_timeout;
-extern int rm_resource_heartbeat_interval;
+extern int rm_session_lease_heartbeat_interval;
extern int rm_tolerate_nseg_limit;
extern int rm_rejectrequest_nseg_limit;
extern int rm_nvseg_variance_among_seg_limit;
@@ -1204,12 +1205,11 @@ extern int rm_enforce_cleanup_period;
extern int rm_enforce_cgrp_timeout;
extern int rm_allocation_policy;
-extern char *rm_tmp_dirs;
extern char *rm_master_tmp_dirs;
extern char *rm_seg_tmp_dirs;
extern int rm_log_level;
-extern int rm_max_resource_queue_number;
+extern int rm_nresqueue_limit;
extern int max_filecount_notto_split_segment;
extern int min_datasize_to_combine_segment;
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1d0840b4/tools/bin/gpmigrator
----------------------------------------------------------------------
diff --git a/tools/bin/gpmigrator b/tools/bin/gpmigrator
index 1de4d5b..f190184 100755
--- a/tools/bin/gpmigrator
+++ b/tools/bin/gpmigrator
@@ -1698,8 +1698,8 @@ class GPUpgrade(GPUpgradeBase):
# yarn related is set to default value: yarn disabled
self.update_xml_content(file_cont, 'hawq_global_rm_type', 'none')
- self.update_xml_content(file_cont, 'hawq_resourcemanager_yarn_resourcemanager_address', 'localhost:9980')
- self.update_xml_content(file_cont, 'hawq_resourcemanager_yarn_resourcemanager_scheduler_address', 'localhost:9981')
+ self.update_xml_content(file_cont, 'hawq_rm_yarn_address', 'localhost:9980')
+ self.update_xml_content(file_cont, 'hawq_rm_yarn_scheduler_address', 'localhost:9981')
# write buffer back to the xml file
f2 = open("%s/etc/hawq-site.xml" % self.newhome, 'w')