eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qingwz...@apache.org
Subject eagle git commit: [EAGLE-1022] Fix runtime exception when parsing spark.yarn.executor.memoryOverhead
Date Fri, 19 May 2017 05:51:05 GMT
Repository: eagle
Updated Branches:
  refs/heads/branch-0.5 7111b7656 -> 3e62a756c


[EAGLE-1022] Fix runtime exception when parsing spark.yarn.executor.memoryOverhead

https://issues.apache.org/jira/browse/EAGLE-1022

Author: Zhao, Qingwen <qingwzhao@apache.org>

Closes #934 from qingwen220/EAGLE-1022.

(cherry picked from commit 7d39863f48916116e99cdff98527e60f9379a475)
Signed-off-by: Zhao, Qingwen <qingwzhao@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/3e62a756
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/3e62a756
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/3e62a756

Branch: refs/heads/branch-0.5
Commit: 3e62a756c6c7991fa3f1901e2d807fbd9c182788
Parents: 7111b76
Author: Zhao, Qingwen <qingwzhao@apache.org>
Authored: Fri May 19 13:49:37 2017 +0800
Committer: Zhao, Qingwen <qingwzhao@apache.org>
Committed: Fri May 19 13:50:54 2017 +0800

----------------------------------------------------------------------
 .../eagle/jpm/spark/history/crawl/JHFSparkEventReader.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/eagle/blob/3e62a756/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
index 2ef1bd9..45cb730 100644
--- a/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
+++ b/eagle-jpm/eagle-jpm-spark-history/src/main/java/org/apache/eagle/jpm/spark/history/crawl/JHFSparkEventReader.java
@@ -487,8 +487,9 @@ public class JHFSparkEventReader {
         long result = 0L;
         String fieldValue = config.getConfig().get(fieldName);
         if (fieldValue != null) {
-            result = Utils.parseMemory(fieldValue + "m");
-            if (result == 0L) {
+            try {
+                result = Utils.parseMemory(fieldValue + "m");
+            } catch (Exception e) {
                 result = Utils.parseMemory(fieldValue);
             }
         }


Mime
View raw message