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: Revert "Revert "HAWQ-424. When HAWQ RM keeps getting 0 GRM containers query resource request is not timed out""
Date Tue, 23 Feb 2016 01:37:38 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master e80c20cff -> 109a17400


Revert "Revert "HAWQ-424. When HAWQ RM keeps getting 0 GRM containers query resource request
is not timed out""

This reverts commit 1d7e25958f88b4c686665a2254e89d2c7542abbf.


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

Branch: refs/heads/master
Commit: 109a174001d16160de194e8507a7a127e93db71c
Parents: e80c20c
Author: YI JIN <yjin@pivotal.io>
Authored: Tue Feb 23 12:37:15 2016 +1100
Committer: YI JIN <yjin@pivotal.io>
Committed: Tue Feb 23 12:37:15 2016 +1100

----------------------------------------------------------------------
 .../resourcemanager/resourcebroker/resourcebroker_LIBYARN.c        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/109a1740/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
index c97e340..1e8c7ac 100644
--- a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
+++ b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
@@ -868,7 +868,7 @@ int handleRB2RM_AllocatedResource(void)
 	removePendingResourceRequestInRootQueue(
 		response.MemoryMB * (response.ExpectedContainerCount - acceptedcount),
 		response.Core     * (response.ExpectedContainerCount - acceptedcount),
-		response.Result == FUNC_RETURN_OK);
+		(response.Result == FUNC_RETURN_OK) && (acceptedcount > 0));
 
 	elog(LOG, "Resource manager accepted YARN containers (%d MB, %d CORE) x %d "
 			  "from resource broker, expected %d containers, skipped %d containers.",


Mime
View raw message