You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 02:54:29 UTC
[15/31] incubator-kylin git commit: KYLIN-1067 Kylin get MapReduce
Job status with "yarn.resourcemanager.webapp.address" need suport
ResourceManager HA config
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/933e81fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/933e81fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/933e81fd
Branch: refs/heads/KYLIN-1112
Commit: 933e81fd17cb29893ca13e8245598c9d20b6fa94
Parents: b4c53ad
Author: wangxiaoyu8 <wa...@jd.com>
Authored: Mon Oct 12 11:34:47 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 09:53:16 2015 +0800
----------------------------------------------------------------------
.../kylin/engine/mr/common/MapReduceExecutable.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/933e81fd/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java
index c1aa42e..4fb3eed 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/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;
@@ -198,7 +201,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;
}