HAWQ-555. Remove unused guc for allocating resource for tolerating variance of 
number of virtual segments


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

Branch: refs/heads/HAWQ-459
Commit: 2c033d9f069bb2fe092dba3ec4ed9cb2d2e13e5f
Parents: 3ae24a3
Author: YI JIN <[email protected]>
Authored: Fri Mar 18 13:41:49 2016 +1100
Committer: YI JIN <[email protected]>
Committed: Fri Mar 18 13:41:49 2016 +1100

----------------------------------------------------------------------
 src/backend/cdb/cdbvars.c                  |  2 --
 src/backend/resourcemanager/resourcepool.c |  4 ++--
 src/backend/utils/misc/guc.c               | 11 -----------
 3 files changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2c033d9f/src/backend/cdb/cdbvars.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index b4a9f3d..a2476fd 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -390,8 +390,6 @@ double      rm_regularize_io_factor;
 double rm_regularize_usage_factor;
 double rm_regularize_nvseg_factor;
 
-int            rm_nvseg_variance_among_seg_respool_limit;
-
 /* Greenplum Database Experimental Feature GUCs */
 int         gp_distinct_grouping_sets_threshold = 32;
 bool           gp_enable_explain_allstat = FALSE;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2c033d9f/src/backend/resourcemanager/resourcepool.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resourcepool.c 
b/src/backend/resourcemanager/resourcepool.c
index ca275f5..e5d083c 100644
--- a/src/backend/resourcemanager/resourcepool.c
+++ b/src/backend/resourcemanager/resourcepool.c
@@ -2556,7 +2556,7 @@ int allocateResourceFromResourcePoolIOBytes2(int32_t      
 nodecount,
                freePAIRRefList(&(PRESPOOL->Segments), &ressegl);
                Assert(minnvseg <= maxnvseg);
 
-               if ( maxnvseg - minnvseg > 
rm_nvseg_variance_among_seg_respool_limit )
+               if ( maxnvseg - minnvseg > rm_tolerate_nseg_limit )
                {
                        elog(LOG, "Reject virtual segment allocation based on 
data "
                                          "locality information. After 
tentative allocation "
@@ -2565,7 +2565,7 @@ int allocateResourceFromResourcePoolIOBytes2(int32_t      
 nodecount,
                                          "is %d, tolerated difference limit is 
%d.",
                                          maxnvseg,
                                          minnvseg,
-                                         
rm_nvseg_variance_among_seg_respool_limit);
+                                         rm_tolerate_nseg_limit);
 
                        /* Return the allocated resource. */
                        List     *vsegcntlist = NULL;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2c033d9f/src/backend/utils/misc/guc.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 54ef13f..3d13eb4 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -6557,17 +6557,6 @@ static struct config_int ConfigureNamesInt[] =
        },
 
        {
-               {"hawq_rm_nvseg_variance_amon_seg_respool_limit", 
PGC_POSTMASTER, RESOURCES_MGM,
-                       gettext_noop("the variance of vseg number in each 
segment that resource manager "
-                                                "should tolerate at most in 
resource pool when choosing segments "
-                                                "based on data locality 
reference."),
-                       NULL
-               },
-               &rm_nvseg_variance_among_seg_respool_limit,
-               2, 0, 65535, NULL, NULL
-       },
-
-       {
                {"hawq_rm_container_batch_limit", PGC_POSTMASTER, RESOURCES_MGM,
                        gettext_noop("the batch process limit for global 
resource manager containers."),
                        NULL

Reply via email to