[kylin] branch 2.6.x updated: KYLIN-4657 dead-loop in org.apache.kylin.engine.mr.common.MapReduceExecutable.doWork

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 08745f2  KYLIN-4657 dead-loop in 
org.apache.kylin.engine.mr.common.MapReduceExecutable.doWork
08745f2 is described below

commit 08745f20086f3d5a374a13976eb4f8c29e4e588b
Author: ITzhangqiang <itzhangqi...@163.com>
AuthorDate: Wed Aug 5 10:29:19 2020 +0800

    KYLIN-4657 dead-loop in 
org.apache.kylin.engine.mr.common.MapReduceExecutable.doWork
---
 .../java/org/apache/kylin/engine/mr/common/MapReduceExecutable.java   | 4 ++++
 1 file changed, 4 insertions(+)

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 7bf9a92..b73fb77 100755
--- 
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
@@ -118,6 +118,10 @@ public class MapReduceExecutable extends 
AbstractExecutable {
             final Map<String, String> extra = 
mgr.getOutput(getId()).getExtra();
             if (extra.containsKey(ExecutableConstants.MR_JOB_ID)) {
                 job = new 
Cluster(conf).getJob(JobID.forName(extra.get(ExecutableConstants.MR_JOB_ID)));
+                if (job == null) {
+                    logger.error("getJob by jobId {} failed , please check RM 
or job history server", extra.get("mr_job_id"));
+                    return ExecuteResult.createFailed(new 
MapReduceException("job failed"));
+                }
                 logger.info("mr_job_id:" + 
extra.get(ExecutableConstants.MR_JOB_ID) + " resumed");
             } else {
                 final Constructor<? extends AbstractHadoopJob> constructor = 
ClassUtil