You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by da...@apache.org on 2015/11/04 06:29:57 UTC

hive git commit: HIVE-12327: WebHCat e2e tests TestJob_1 and TestJob_2 fail (Daniel Dai, reviewed by Thejas Nair)

Repository: hive
Updated Branches:
  refs/heads/master 13f8cfece -> 16a86b261


HIVE-12327: WebHCat e2e tests TestJob_1 and TestJob_2 fail (Daniel Dai, reviewed by Thejas Nair)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/16a86b26
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/16a86b26
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/16a86b26

Branch: refs/heads/master
Commit: 16a86b2612439d6ba1f920deaea822ae4da3dedc
Parents: 13f8cfe
Author: Daniel Dai <da...@hortonworks.com>
Authored: Tue Nov 3 21:29:46 2015 -0800
Committer: Daniel Dai <da...@hortonworks.com>
Committed: Tue Nov 3 21:29:46 2015 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/16a86b26/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
----------------------------------------------------------------------
diff --git a/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java b/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
index 288043f..b020ffe 100644
--- a/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
+++ b/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
@@ -41,6 +41,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 public class WebHCatJTShim23 implements WebHCatJTShim {
   private static final Logger LOG = LoggerFactory.getLogger(WebHCatJTShim23.class);
@@ -139,7 +140,8 @@ public class WebHCatJTShim23 implements WebHCatJTShim {
     }
     catch(IOException ex) {
       String msg = ex.getMessage();
-      if(msg != null && msg.contains("ApplicationNotFoundException")) {
+      if(msg != null && (msg.contains("ApplicationNotFoundException") ||
+          Pattern.compile("History file.*not found").matcher(msg).find())) {
         LOG.info("Job(" + jobid + ") not found: " + msg);
         return null;
       }