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/09 08:36:04 UTC
incubator-hawq git commit: HAWQ-238. Sending wrong size of message
for returning YARN container
Repository: incubator-hawq
Updated Branches:
refs/heads/master 18876b535 -> 34003c3e0
HAWQ-238. Sending wrong size of message for returning YARN container
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/34003c3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/34003c3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/34003c3e
Branch: refs/heads/master
Commit: 34003c3e099c23f2c5f6c624ee61af62752c0516
Parents: 18876b5
Author: Yi Jin <yj...@pivotal.io>
Authored: Wed Dec 9 15:35:55 2015 +0800
Committer: Yi Jin <yj...@pivotal.io>
Committed: Wed Dec 9 15:35:55 2015 +0800
----------------------------------------------------------------------
.../resourcemanager/resourcebroker/resourcebroker_LIBYARN.c | 6 ------
.../resourcebroker/resourcebroker_LIBYARN_proc.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/34003c3e/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 038a29d..419c356 100644
--- a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
+++ b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN.c
@@ -356,7 +356,6 @@ int RB_LIBYARN_returnResource(List **ctnl)
{
int res = FUNC_RETURN_OK;
uint32_t MessageID = RM2RB_RETURN_RESOURCE;
- int32_t Reserved = 0;
if ( *ctnl == NULL )
{
@@ -407,11 +406,6 @@ int RB_LIBYARN_returnResource(List **ctnl)
PRESPOOL->RetPendingContainerCount--;
}
- if ( request.ContainerCount & 0X1 )
- {
- appendSMBVar(&sendBuffer, Reserved);
- }
-
int piperes = pipewrite(ResBrokerRequestPipe[1],
sendBuffer.Buffer,
sendBuffer.Cursor + 1);
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/34003c3e/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
index 11b612d..da7e743 100644
--- a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
+++ b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
@@ -1005,7 +1005,7 @@ int handleRM2RB_ReturnResource(void)
}
/* Read the container id list. */
- actualsize = (((request.ContainerCount + 1)>>1)<<1);
+ actualsize = request.ContainerCount;
containerids = rm_palloc(PCONTEXT, sizeof(int64_t) * actualsize);
piperes = readPipe(ResBrokerRequestPipe[0],