Repository: hive Updated Branches: refs/heads/branch-1 d794ff9e0 -> e3f72d52b
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/e3f72d52 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e3f72d52 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e3f72d52 Branch: refs/heads/branch-1 Commit: e3f72d52b5ba2e7448bf46a6d3590642196c8767 Parents: d794ff9 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:30:28 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/e3f72d52/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 c85a739..f1947bb 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 Log LOG = LogFactory.getLog(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; }
