hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject incubator-hawq git commit: HAWQ-112. Fix possible null pointer using
Date Fri, 30 Oct 2015 02:39:40 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 1d0840b47 -> 8e59c700e


HAWQ-112. Fix possible null pointer using


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

Branch: refs/heads/master
Commit: 8e59c700e9acd01a4fad5fe34ba599fcff577bec
Parents: 1d0840b
Author: Wen Lin <wlin@pivotal.io>
Authored: Fri Oct 30 10:44:57 2015 +0800
Committer: Wen Lin <wlin@pivotal.io>
Committed: Fri Oct 30 10:44:57 2015 +0800

----------------------------------------------------------------------
 .../resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/8e59c700/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 4c2cc64..dce4c83 100644
--- a/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
+++ b/src/backend/resourcemanager/resourcebroker/resourcebroker_LIBYARN_proc.c
@@ -1311,11 +1311,11 @@ int RB2YARN_registerYARNApplication(void)
 	LibYarnApplicationReport_t *applicationReport = NULL;
 	while (retry > 0)
 	{
+		retry--;
 		result = getApplicationReport(LIBYARNClient, YARNJobID, &applicationReport);
 		if (result != FUNCTION_SUCCEEDED || applicationReport == NULL)
 		{
 			if (retry > 0) {
-				retry--;
 				usleep(HAWQ_YARN_AM_HEARTBEAT_INTERVAL*1000*1000L);
 				continue;
 			} else {
@@ -1331,7 +1331,6 @@ int RB2YARN_registerYARNApplication(void)
 		if (applicationReport->progress < 0.5)
 		{
 			if (retry > 0) {
-				retry--;
 				usleep(HAWQ_YARN_AM_HEARTBEAT_INTERVAL*1000*1000L);
 				continue;
 			} else {


Mime
View raw message