HAWQ-556. Resource manager uses unadjusted water level guc for allocating GRM resource containers
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/f38ad114 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/f38ad114 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/f38ad114 Branch: refs/heads/HAWQ-459 Commit: f38ad11472cd3c8084ac156123583239e192be5b Parents: 17af44c Author: YI JIN <[email protected]> Authored: Fri Mar 18 13:49:09 2016 +1100 Committer: YI JIN <[email protected]> Committed: Fri Mar 18 13:49:09 2016 +1100 ---------------------------------------------------------------------- src/backend/resourcemanager/resourcemanager.c | 2 +- src/backend/resourcemanager/resqueuemanager.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/f38ad114/src/backend/resourcemanager/resourcemanager.c ---------------------------------------------------------------------- diff --git a/src/backend/resourcemanager/resourcemanager.c b/src/backend/resourcemanager/resourcemanager.c index 21bf0d1..5a01316 100644 --- a/src/backend/resourcemanager/resourcemanager.c +++ b/src/backend/resourcemanager/resourcemanager.c @@ -2065,7 +2065,7 @@ int generateAllocRequestToBroker(void) } /* Decide water level of resource. */ - int wlevel = hasWorkload ? rm_min_resource_perseg : 0; + int wlevel = hasWorkload ? PQUEMGR->ActualMinGRMContainerPerSeg : 0; switch( DRMGlobalInstance->ImpType ) { case YARN_LIBYARN: http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/f38ad114/src/backend/resourcemanager/resqueuemanager.c ---------------------------------------------------------------------- diff --git a/src/backend/resourcemanager/resqueuemanager.c b/src/backend/resourcemanager/resqueuemanager.c index cbf824e..538c2ad 100644 --- a/src/backend/resourcemanager/resqueuemanager.c +++ b/src/backend/resourcemanager/resqueuemanager.c @@ -5213,8 +5213,10 @@ void getIdleResourceRequest(int32_t *mem, double *core) Assert(PRESPOOL->ClusterMemoryCoreRatio > 0); *mem = PRESPOOL->ClusterMemoryCoreRatio * PRESPOOL->AvailNodeCount * - rm_min_resource_perseg; - *core = 1.0 * PRESPOOL->AvailNodeCount * rm_min_resource_perseg; + PQUEMGR->ActualMinGRMContainerPerSeg; + *core = 1.0 * + PRESPOOL->AvailNodeCount * + PQUEMGR->ActualMinGRMContainerPerSeg; } void setForcedReturnGRMContainerCount(void)
