You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by qh...@apache.org on 2015/11/02 03:41:26 UTC
incubator-kylin git commit: KYLIN-1067 Kylin get MapReduce Job status
with "yarn.resourcemanager.webapp.address" need suport ResourceManager HA
config
Repository: incubator-kylin
Updated Branches:
refs/heads/1.x-staging 23754e7f4 -> 0f9acf002
KYLIN-1067 Kylin get MapReduce Job status with "yarn.resourcemanager.webapp.address" need suport ResourceManager HA config
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/0f9acf00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/0f9acf00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/0f9acf00
Branch: refs/heads/1.x-staging
Commit: 0f9acf00299cad5a853f4ec0c6f0508dfa995018
Parents: 23754e7
Author: wangxiaoyu8 <wa...@jd.com>
Authored: Mon Oct 12 11:32:26 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Mon Nov 2 10:39:05 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/job/common/MapReduceExecutable.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0f9acf00/job/src/main/java/org/apache/kylin/job/common/MapReduceExecutable.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/common/MapReduceExecutable.java b/job/src/main/java/org/apache/kylin/job/common/MapReduceExecutable.java
index 4a8009c..cbf453d 100644
--- a/job/src/main/java/org/apache/kylin/job/common/MapReduceExecutable.java
+++ b/job/src/main/java/org/apache/kylin/job/common/MapReduceExecutable.java
@@ -32,6 +32,9 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.mapreduce.JobStatus;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.yarn.conf.HAUtil;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.util.RMHAUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.util.ClassUtil;
import org.apache.kylin.job.constant.ExecutableConstants;
@@ -181,7 +184,12 @@ public class MapReduceExecutable extends AbstractExecutable {
} else {
logger.info(KylinConfig.KYLIN_JOB_YARN_APP_REST_CHECK_URL + " is not set, read from job configuration");
}
- String rmWebHost = job.getConfiguration().get("yarn.resourcemanager.webapp.address");
+ String rmWebHost = HAUtil.getConfValueForRMInstance(YarnConfiguration.RM_WEBAPP_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, job.getConfiguration());
+ if(HAUtil.isHAEnabled(job.getConfiguration())) {
+ YarnConfiguration conf = new YarnConfiguration(job.getConfiguration());
+ String active = RMHAUtils.findActiveRMHAId(conf);
+ rmWebHost = HAUtil.getConfValueForRMInstance(HAUtil.addSuffix(YarnConfiguration.RM_WEBAPP_ADDRESS, active), YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS, conf);
+ }
if (StringUtils.isEmpty(rmWebHost)) {
return null;
}