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/6eaad6be Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6eaad6be Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6eaad6be Branch: refs/heads/master-fixed Commit: 6eaad6bea6513ec6005b152d59d51d8a6d744efc Parents: 3228ba7 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/6eaad6be/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; }