From f0605146b34ddbd19fc9e52d4761f9a347d5173e Mon Sep 17 00:00:00 2001
From: Weiwei Yang <wwei@apache.org>
Date: Mon, 11 Mar 2019 15:02:54 +0800
Subject: [PATCH] MAPREDUCE-7191. JobHistoryServer should log exception when
 loading/parsing history file failed. Contributed by Jiandan Yang.

---
 .../hadoop/mapreduce/v2/hs/CompletedJob.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
index a4e75f74a8..e9a6a641b5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
@@ -380,17 +380,20 @@ protected synchronized void loadFullHistoryData(boolean loadTasks,
         parser = createJobHistoryParser(historyFileAbsolute);
         this.jobInfo = parser.parse();
       } catch (IOException e) {
-        throw new YarnRuntimeException("Could not load history file "
-            + historyFileAbsolute, e);
+        String errorMsg = "Could not load history file " + historyFileAbsolute;
+        LOG.warn(errorMsg, e);
+        throw new YarnRuntimeException(errorMsg, e);
       }
       IOException parseException = parser.getParseException(); 
       if (parseException != null) {
-        throw new YarnRuntimeException(
-            "Could not parse history file " + historyFileAbsolute, 
-            parseException);
+        String errorMsg = "Could not parse history file " + historyFileAbsolute;
+        LOG.warn(errorMsg, parseException);
+        throw new YarnRuntimeException(errorMsg, parseException);
       }
     } else {
-      throw new IOException("History file not found");
+      String errorMsg = "History file not found";
+      LOG.warn(errorMsg);
+      throw new IOException(errorMsg);
     }
     if (loadTasks) {
       loadAllTasks();