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 "HAWQ-424. When HAWQ RM keeps getting 0 GRM containers query resource request is not timed out"
Date Mon, 22 Feb 2016 12:24:23 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 9390e92bb -> 1d7e25958


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

This reverts commit 27b12112f15913a88d5ee5e2321593af598667b7.


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

Branch: refs/heads/master
Commit: 1d7e25958f88b4c686665a2254e89d2c7542abbf
Parents: 9390e92
Author: YI JIN <yjin@pivotal.io>
Authored: Mon Feb 22 23:23:34 2016 +1100
Committer: YI JIN <yjin@pivotal.io>
Committed: Mon Feb 22 23:23:34 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/1d7e2595/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 1e8c7ac..c97e340 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) && (acceptedcount > 0));
+		response.Result == FUNC_RETURN_OK);
 
 	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