Revert "HAWQ-547. When HAWQ RM does not have valid YARN resource queue status received the cluster report is not accepted"
This reverts commit 5fda1826aff4780b20e24db5210f79f867ef39ae. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/2be5899c Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/2be5899c Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/2be5899c Branch: refs/heads/HAWQ-459 Commit: 2be5899ca55b954de90aa72d00c8bd02f8f2fb83 Parents: aef7bd2 Author: YI JIN <[email protected]> Authored: Thu Mar 17 16:41:40 2016 +1100 Committer: YI JIN <[email protected]> Committed: Thu Mar 17 16:41:40 2016 +1100 ---------------------------------------------------------------------- src/backend/resourcemanager/include/errorcode.h | 1 - .../resourcebroker/resourcebroker_LIBYARN.c | 18 ++---------------- 2 files changed, 2 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2be5899c/src/backend/resourcemanager/include/errorcode.h ---------------------------------------------------------------------- diff --git a/src/backend/resourcemanager/include/errorcode.h b/src/backend/resourcemanager/include/errorcode.h index de08fff..ca338a8 100644 --- a/src/backend/resourcemanager/include/errorcode.h +++ b/src/backend/resourcemanager/include/errorcode.h @@ -162,7 +162,6 @@ enum DRM_ERROR_CODE { RESBROK_WRONG_GLOB_MGR_ADDRESS, RESBROK_WRONG_GLOB_MGR_QUEUE, RESBROK_WRONG_GLOB_MGR_APPNAME, - RESBROK_WRONG_GLOB_MGR_QUEUEREPORT, RESBROK_PIPE_ERROR, RESBROK_NOMORE_RESOURCE_IN_GRM, RESBROK_WRONG_MESSAGE_ID, http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2be5899c/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 b8d205e..cdbe0d5 100644 --- a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c +++ b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c @@ -568,7 +568,7 @@ int handleRB2RM_ClusterReport(void) } elog(LOG, "YARN mode resource broker got cluster report having %d host(s), " - "maximum queue capacity is %lf.", + "maximum capacity is %lf.", response.MachineCount, response.QueueMaxCapacity); @@ -631,19 +631,6 @@ int handleRB2RM_ClusterReport(void) * TILL NOW, the whole message content is received. */ - if ( res == FUNC_RETURN_OK ) - { - /* Check if the YARN resource queue report is valid, i.e. maximum - * capacity and capacity are all greater than 0. - */ - if ( response.QueueCapacity <= 0 || response.QueueMaxCapacity <= 0 ) - { - elog(WARNING, "YARN mode resource broker got invalid cluster report"); - res = RESBROK_WRONG_GLOB_MGR_QUEUEREPORT; - - } - } - /* If something wrong, no need to keep the received content, free them. */ if ( res != FUNC_RETURN_OK ) { @@ -1189,7 +1176,6 @@ void RB_LIBYARN_handleError(int errorcode) } else { - Assert(errorcode == FUNC_RETURN_OK || - errorcode == RESBROK_WRONG_GLOB_MGR_QUEUEREPORT); + Assert(errorcode == FUNC_RETURN_OK); } }
