Repository: oozie Updated Branches: refs/heads/master a04a62b66 -> 69b6aa8dd
OOZIE-2112 Child Job URL doesn't show properly with Hive on Tez (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/69b6aa8d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/69b6aa8d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/69b6aa8d Branch: refs/heads/master Commit: 69b6aa8dd9300dc5a15e7fa72228796f130574ad Parents: a04a62b Author: egashira <[email protected]> Authored: Wed Jan 28 10:03:32 2015 -0800 Committer: egashira <[email protected]> Committed: Wed Jan 28 10:03:32 2015 -0800 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/java/org/apache/oozie/action/hadoop/HiveMain.java | 3 ++- .../main/java/org/apache/oozie/action/hadoop/LauncherMain.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/69b6aa8d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index aadff5f..86a4f8d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2112 Child Job URL doesn't show properly with Hive on Tez (ryota) OOZIE-2122 fix test case failure of TestLiteWorkflowAppService (ryota) OOZIE-2055 PauseTransitService does not proceed forward if any job has issue (puru) OOZIE-2068 Configuration as part of sharelib (puru) http://git-wip-us.apache.org/repos/asf/oozie/blob/69b6aa8d/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java index 46661e0..6278d29 100644 --- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java +++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java @@ -41,7 +41,8 @@ import org.apache.hadoop.hive.conf.HiveConf; public class HiveMain extends LauncherMain { private static final Pattern[] HIVE_JOB_IDS_PATTERNS = { - Pattern.compile("Ended Job = (job_\\S*)") + Pattern.compile("Ended Job = (job_\\S*)"), + Pattern.compile("Executing on YARN cluster with App id (application[0-9_]*)") }; private static final Set<String> DISALLOWED_HIVE_OPTIONS = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/oozie/blob/69b6aa8d/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java index ae983cd..552c862 100644 --- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java @@ -63,7 +63,7 @@ public abstract class LauncherMain { if (StringUtils.isEmpty(jobId) || jobId.equalsIgnoreCase("NULL")) { continue; } - + jobId = jobId.replaceAll("application","job"); sb.append(separator).append(jobId); separator = ","; }
