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/12/18 06:09:25 UTC
incubator-hawq git commit: HAWQ-260. Resource manager wrongly
calculates number of vseg
Repository: incubator-hawq
Updated Branches:
refs/heads/master 59f94f2cd -> 5ad0995b4
HAWQ-260. Resource manager wrongly calculates number of vseg
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/5ad0995b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/5ad0995b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/5ad0995b
Branch: refs/heads/master
Commit: 5ad0995b41d5b8093b34291846dc59867308f57a
Parents: 59f94f2
Author: YI JIN <yj...@pivotal.io>
Authored: Fri Dec 18 16:09:07 2015 +1100
Committer: YI JIN <yj...@pivotal.io>
Committed: Fri Dec 18 16:09:07 2015 +1100
----------------------------------------------------------------------
src/backend/resourcemanager/resqueuemanager.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5ad0995b/src/backend/resourcemanager/resqueuemanager.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resqueuemanager.c b/src/backend/resourcemanager/resqueuemanager.c
index 772af47..427ab4e 100644
--- a/src/backend/resourcemanager/resqueuemanager.c
+++ b/src/backend/resourcemanager/resqueuemanager.c
@@ -3384,9 +3384,8 @@ int computeQueryQuota(ConnectionTrack conn, char *errorbuf, int errorbufsize)
*/
if ( conn->MinSegCountFixed != conn->MaxSegCountFixed )
{
- vseglimit = conn->VSegLimit ?
- conn->VSegLimit :
- conn->VSegLimitPerSeg * PRESPOOL->AvailNodeCount;
+ vseglimit = conn->VSegLimitPerSeg * PRESPOOL->AvailNodeCount;
+ vseglimit = conn->VSegLimit < vseglimit? conn->VSegLimit : vseglimit;
}
else
{