HAWQ-584. Choose cluster memory to core ratio a multiple of 1GB
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e9f1d95b Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e9f1d95b Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e9f1d95b Branch: refs/heads/HAWQ-546 Commit: e9f1d95b8688fd3b4d9421b7f0ae3abcbaa067f2 Parents: ecb85e5 Author: YI JIN <y...@pivotal.io> Authored: Fri Mar 25 13:00:49 2016 +1100 Committer: Oleksandr Diachenko <odiache...@pivotal.io> Committed: Wed Mar 30 17:23:30 2016 -0700 ---------------------------------------------------------------------- src/backend/cdb/cdbvars.c | 3 +- src/backend/resourcemanager/resourcepool.c | 149 ++++++++++-------------- src/backend/utils/misc/guc.c | 10 ++ src/include/cdb/cdbvars.h | 2 + 4 files changed, 73 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e9f1d95b/src/backend/cdb/cdbvars.c ---------------------------------------------------------------------- diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c index b4a9f3d..3be0822 100644 --- a/src/backend/cdb/cdbvars.c +++ b/src/backend/cdb/cdbvars.c @@ -366,7 +366,6 @@ int rm_rejectrequest_nseg_limit; int rm_nvseg_variance_among_seg_limit; int rm_container_batch_limit; - char *rm_resourcepool_test_filename; bool rm_enforce_cpu_enable; @@ -390,6 +389,8 @@ double rm_regularize_io_factor; double rm_regularize_usage_factor; double rm_regularize_nvseg_factor; +int rm_clusterratio_core_to_memorygb_factor; + int rm_nvseg_variance_among_seg_respool_limit; /* Greenplum Database Experimental Feature GUCs */ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e9f1d95b/src/backend/resourcemanager/resourcepool.c ---------------------------------------------------------------------- diff --git a/src/backend/resourcemanager/resourcepool.c b/src/backend/resourcemanager/resourcepool.c index 3359207..abc4abc 100644 --- a/src/backend/resourcemanager/resourcepool.c +++ b/src/backend/resourcemanager/resourcepool.c @@ -4577,85 +4577,28 @@ void fixClusterMemoryCoreRatio(void) } /* - * Go into real calculation of the cluster level memory to core ratio now, - * The idea of fixing the ratio is to calculate possible - */ - - HASHTABLEData ratios; - initializeHASHTABLE(&ratios, - PCONTEXT, - HASHTABLE_SLOT_VOLUME_DEFAULT, - HASHTABLE_SLOT_VOLUME_DEFAULT_MAX, - HASHTABLE_KEYTYPE_UINT32, - NULL); - - /* - * STEP 1. Go through all current segments to get segment level ratios. + * Go through all current segments to get segment level ratios. */ + uint32_t cratio = 1024; + uint32_t maxmemmb = 0; List *ressegl = NULL; ListCell *cell = NULL; getAllPAIRRefIntoList(&(PRESPOOL->Segments), &ressegl); - foreach(cell, ressegl) - { - PAIR pair = (PAIR)lfirst(cell); - SegResource segres = (SegResource)(pair->Value); - uint32_t ratio = 0; - uint32_t memorymb = 0; - uint32_t core = 0; - - if ( !IS_SEGSTAT_FTSAVAILABLE(segres->Stat) ) - { - continue; - } - - if ( DRMGlobalInstance->ImpType == NONE_HAWQ2 ) - { - memorymb = segres->Stat->FTSTotalMemoryMB; - core = segres->Stat->FTSTotalCore; - } - else - { - /* - * If this segment is FTS available, - * RM should get GRM report for it. - */ - Assert((segres->Stat->StatusDesc & SEG_STATUS_NO_GRM_NODE_REPORT) - == 0); - memorymb = segres->Stat->GRMTotalMemoryMB; - core = segres->Stat->GRMTotalCore; - } - Assert(core > 0); - ratio = memorymb / core; - PAIR ratiopair = getHASHTABLENode(&ratios, TYPCONVERT(void *, ratio)); - if ( ratiopair == NULL ) - { - setHASHTABLENode(&ratios, TYPCONVERT(void *, ratio), NULL, false); - } - } - - /* - * STEP 2. Choose one ratio as cluster ratio by estimating the possible - * resource waste. - */ - uint32_t minmemorywaste = UINT32_MAX; - uint32_t candratio = 0; - - List *ratiol = NULL; - ListCell *ratiocell = NULL; - getAllPAIRRefIntoList(&ratios, &ratiol); - foreach(ratiocell, ratiol) + uint32_t minwaste = UINT32_MAX; + uint32_t minwasteratio = cratio; + uint32_t minwastememorymb = 0; + uint32_t minwastecore = 0; + while ( true ) { - PAIR pair = (PAIR)lfirst(ratiocell); - uint32_t segratio = TYPCONVERT(uint32_t, pair->Key); + uint32_t wastememorymb = 0; + uint32_t wastecore = 0; - uint32_t memorywaste = 0; foreach(cell, ressegl) { - PAIR segpair = (PAIR)lfirst(cell); - SegResource segres = (SegResource)(segpair->Value); - uint32_t ratio = 0; + PAIR pair = (PAIR)lfirst(cell); + SegResource segres = (SegResource)(pair->Value); uint32_t memorymb = 0; uint32_t core = 0; @@ -4672,48 +4615,75 @@ void fixClusterMemoryCoreRatio(void) else { /* - * If this segment is FTS available, - * RM should get GRM report for it. + * If this segment is FTS available, RM should get GRM report for it. */ Assert((segres->Stat->StatusDesc & SEG_STATUS_NO_GRM_NODE_REPORT) == 0); memorymb = segres->Stat->GRMTotalMemoryMB; core = segres->Stat->GRMTotalCore; } + Assert(core > 0); - ratio = memorymb / core; - uint32_t segmemwaste = 0; - if ( segratio * core > memorymb ) + if ( maxmemmb < memorymb ) { - segmemwaste = memorymb - (memorymb / segratio) * segratio; + maxmemmb = memorymb; } - else + + int count = (core * cratio > memorymb) ? + (memorymb / cratio) : + core; + wastememorymb += memorymb - count * cratio; + wastecore += core - count *1; + } + + elog(DEBUG3, "Ratio %d, having %d MB %d CORE wasted.", + cratio, + wastememorymb, + wastecore); + + /* + * Check if we got minimum resource waste this time. We expect firstly + * we can use as much memory as possible then as much core as possible. + */ + uint32_t waste = wastememorymb + + wastecore * rm_clusterratio_core_to_memorygb_factor * 1024; + if ( waste < minwaste ) + { + minwaste = waste; + minwasteratio = cratio; + minwastememorymb = wastememorymb; + minwastecore = wastecore; + if ( waste == 0 ) { - segmemwaste = memorymb - core *segratio; + break; } - memorywaste += segmemwaste; } - elog(RMLOG, "Resource manager estimates that ratio %u MB per core wastes " - "%d MB resource in the whole recognized cluster.", - segratio, - memorywaste); + if ( maxmemmb == 0 ) + { + /* If no available segment to fix ratio, dont loop. */ + break; + } - if ( memorywaste < minmemorywaste ) + if ( cratio >= maxmemmb ) + { + break; + } + else { - minmemorywaste = memorywaste; - candratio = segratio; + cratio += 1024; /* The step is 1gb. */ } } - PRESPOOL->ClusterMemoryCoreRatio = candratio; + PRESPOOL->ClusterMemoryCoreRatio = minwasteratio; elog(LOG, "Resource manager chooses ratio %u MB per core as cluster level " - "memory to core ratio, there are %d MB memory resource unable to " - "utilize.", + "memory to core ratio, there are %d MB memory %d CORE resource " + "unable to be utilized.", PRESPOOL->ClusterMemoryCoreRatio, - minmemorywaste); + minwastememorymb, + minwastecore); /* * Refresh segments' capacity following the fixed cluster level memory to @@ -4729,7 +4699,6 @@ void fixClusterMemoryCoreRatio(void) /* Clean up. */ freePAIRRefList(&(PRESPOOL->Segments), &ressegl); - cleanHASHTABLE(&ratios); } http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e9f1d95b/src/backend/utils/misc/guc.c ---------------------------------------------------------------------- diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index a881b31..9718f94 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6577,6 +6577,16 @@ static struct config_int ConfigureNamesInt[] = }, { + {"hawq_rm_clusterratio_core_to_memorygb_factor",PGC_POSTMASTER, RESOURCES_MGM, + gettext_noop("Set the factor of balance one virtual core to memory by gigabyte " + "for fixing cluster level memory to core ratio."), + NULL + }, + &rm_clusterratio_core_to_memorygb_factor, + 5, 0, 65535, NULL, NULL + }, + + { {"hawq_rm_nresqueue_limit", PGC_POSTMASTER, RESOURCES_MGM, gettext_noop("the maximum number of resource queue."), NULL http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e9f1d95b/src/include/cdb/cdbvars.h ---------------------------------------------------------------------- diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h index 3129f88..c590ab8 100644 --- a/src/include/cdb/cdbvars.h +++ b/src/include/cdb/cdbvars.h @@ -1223,6 +1223,8 @@ extern double rm_regularize_io_factor; extern double rm_regularize_usage_factor; extern double rm_regularize_nvseg_factor; +extern int rm_clusterratio_core_to_memorygb_factor; + extern int rm_nvseg_variance_among_seg_respool_limit; extern int max_filecount_notto_split_segment;
