Repository: eagle Updated Branches: refs/heads/master 342df9974 -> 7d39863f4
[EAGLE-1022] Fix runtime exception when parsing spark.yarn.executor.memoryOverhead https://issues.apache.org/jira/browse/EAGLE-1022 Author: Zhao, Qingwen <[email protected]> Closes #934 from qingwen220/EAGLE-1022. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/7d39863f Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/7d39863f Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/7d39863f Branch: refs/heads/master Commit: 7d39863f48916116e99cdff98527e60f9379a475 Parents: 342df99 Author: Zhao, Qingwen <[email protected]> Authored: Fri May 19 13:49:37 2017 +0800 Committer: Zhao, Qingwen <[email protected]> Committed: Fri May 19 13:49:37 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/7d39863f/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); } }
