hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From y...@apache.org
Subject incubator-hawq git commit: HAWQ-447. YARN mode resource manager does not count available segment back in to available segment counter
Date Thu, 25 Feb 2016 02:01:33 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master dd52db554 -> 82922984e


HAWQ-447. YARN mode resource manager does not count available segment back in to available
segment counter


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

Branch: refs/heads/master
Commit: 82922984ed6046cdf98f911342d08b0a21279511
Parents: dd52db5
Author: YI JIN <yjin@pivotal.io>
Authored: Thu Feb 25 13:01:18 2016 +1100
Committer: YI JIN <yjin@pivotal.io>
Committed: Thu Feb 25 13:01:18 2016 +1100

----------------------------------------------------------------------
 src/backend/resourcemanager/resourcepool.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/82922984/src/backend/resourcemanager/resourcepool.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resourcepool.c b/src/backend/resourcemanager/resourcepool.c
index 0af5369..321ca74 100644
--- a/src/backend/resourcemanager/resourcepool.c
+++ b/src/backend/resourcemanager/resourcepool.c
@@ -1440,7 +1440,9 @@ int setSegResHAWQAvailability( SegResource segres, uint8_t newstatus)
 							  segres->Stat->GRMTotalCore);
 
 		addNewResourceToResourceManagerByBundle(&(segres->Allocated));
-		if ( DRMGlobalInstance->ImpType == NONE_HAWQ2 )
+		if ( (DRMGlobalInstance->ImpType == NONE_HAWQ2) ||
+			 (DRMGlobalInstance->ImpType != NONE_HAWQ2 &&
+			  IS_SEGSTAT_GRMAVAILABLE(segres->Stat)))
 		{
 			PRESPOOL->AvailNodeCount++;
 		}


Mime
View raw message