[oozie] branch master updated: OOZIE-3439 Hive2 action is not parsing application ID for TEZ from log file properly (shubham.chhabra via kmarton)

[km...@apache.org]

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

kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new 3de02db  OOZIE-3439 Hive2 action is not parsing application ID for TEZ from log file properly (shubham.chhabra via kmarton)
3de02db is described below

commit 3de02dbf45b02c087bc5c397c26b0b349be18b26
Author: Julia Kinga Marton <km...@apache.org>
AuthorDate: Thu Feb 21 13:56:52 2019 +0100

    OOZIE-3439 Hive2 action is not parsing application ID for TEZ from log file properly (shubham.chhabra via kmarton)
---
 release-log.txt                                                        | 1 +
 .../hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/release-log.txt b/release-log.txt
index 6eb57df..b9b7ee9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3439 Hive2 action is not parsing application ID for TEZ from log file properly (shubham.chhabra via kmarton)
 OOZIE-3261 amend [build] Set up mvn clean to delete the "build" directory as well (nobigo via kmarton)
 OOZIE-3261 [build] Set up mvn clean to delete the "build" directory as well (nobigo via kmarton)
 OOZIE-3431 [web UI] Oozie web UI should not serve image from http://extjs.com/s.gif (jtolar via asalamon74)
diff --git a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
index 4da9326..7ec1922 100644
--- a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
+++ b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
@@ -45,7 +45,8 @@ public class Hive2Main extends LauncherMain {
     static final Pattern[] HIVE2_JOB_IDS_PATTERNS = {
             Pattern.compile("Ended Job = (job_\\S*)"),
             Pattern.compile("Submitted application (application[0-9_]*)"),
-            Pattern.compile("Running with YARN Application = (application[0-9_]*)")
+            Pattern.compile("Running with YARN Application = (application[0-9_]*)"),
+            Pattern.compile("Executing on YARN cluster with App id (application[0-9_]*)")
     };
     private static final Set<String> DISALLOWED_BEELINE_OPTIONS = new HashSet<>();