You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wl...@apache.org on 2016/01/25 08:15:11 UTC
incubator-hawq git commit: HAWQ-325. Fix a bug,
if the number of allocated containers is less than expected,
libyarn should give these containers to caller.
Repository: incubator-hawq
Updated Branches:
refs/heads/master df0261e51 -> fd95c34b1
HAWQ-325. Fix a bug, if the number of allocated containers is less than expected,
libyarn should give these containers to caller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/fd95c34b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/fd95c34b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/fd95c34b
Branch: refs/heads/master
Commit: fd95c34b180f7c55830ddaf448441faeb6dc6ddd
Parents: df0261e
Author: Wen Lin <wl...@pivotal.io>
Authored: Mon Jan 25 15:14:37 2016 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Mon Jan 25 15:14:37 2016 +0800
----------------------------------------------------------------------
depends/libyarn/src/CMakeLists.txt | 2 +-
depends/libyarn/src/libyarnclient/LibYarnClient.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fd95c34b/depends/libyarn/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/depends/libyarn/src/CMakeLists.txt b/depends/libyarn/src/CMakeLists.txt
index d19b3b2..3ccdd31 100644
--- a/depends/libyarn/src/CMakeLists.txt
+++ b/depends/libyarn/src/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(libyarn_VERSION_MAJOR 0)
SET(libyarn_VERSION_MINOR 1)
-SET(libyarn_VERSION_PATCH 10)
+SET(libyarn_VERSION_PATCH 11)
SET(libyarn_VERSION_STRING "${libyarn_VERSION_MAJOR}.${libyarn_VERSION_MINOR}.${libyarn_VERSION_PATCH}")
SET(libyarn_VERSION_API 1)
SET(libyarn_ROOT_SOURCES_DIR ${CMAKE_SOURCE_DIR}/src)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fd95c34b/depends/libyarn/src/libyarnclient/LibYarnClient.cpp
----------------------------------------------------------------------
diff --git a/depends/libyarn/src/libyarnclient/LibYarnClient.cpp b/depends/libyarn/src/libyarnclient/LibYarnClient.cpp
index 5208e05..338875e 100644
--- a/depends/libyarn/src/libyarnclient/LibYarnClient.cpp
+++ b/depends/libyarn/src/libyarnclient/LibYarnClient.cpp
@@ -522,7 +522,7 @@ int LibYarnClient::allocateResources(string &jobId,
if (allocatedNumOnce <= 0) {
LOG(WARNING, "LibYarnClient:: fail to allocate from YARN RM, try again");
retry--;
- if(retry == 0) {
+ if(retry == 0 && allocatedNumTotal == 0) {
/* If failed, just return to Resource Broker to handle*/
pthread_mutex_unlock(&heartbeatLock);
LOG(WARNING,"LibYarnClient:: fail to allocate from YARN RM after retry several times");