Repository: incubator-zeppelin Updated Branches: refs/heads/master c9db780a1 -> c7c28ccfd
ZEPPELIN-16 Some failures from Spark and SparkSql note execution are not reported ... reported Author: Ram Venkatesh <[email protected]> Closes #17 from RamVenkatesh/ZEPPELIN-16 and squashes the following commits: 80793c4 [Ram Venkatesh] ZEPPELIN-16 Some failures from Spark and SparkSql note execution are not reported Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/c7c28ccf Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/c7c28ccf Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/c7c28ccf Branch: refs/heads/master Commit: c7c28ccfd58b77b2fa6f7bc01b65c0fb874002b5 Parents: c9db780 Author: Ram Venkatesh <[email protected]> Authored: Mon Mar 30 23:51:04 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Thu Apr 2 08:29:35 2015 +0900 ---------------------------------------------------------------------- .../com/nflabs/zeppelin/markdown/Markdown.java | 3 +- .../nflabs/zeppelin/spark/SparkInterpreter.java | 10 ++---- .../zeppelin/spark/SparkSqlInterpreter.java | 11 ++---- .../zeppelin/interpreter/InterpreterUtils.java | 36 ++++++++++++++++++++ 4 files changed, 42 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c7c28ccf/markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java ---------------------------------------------------------------------- diff --git a/markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java b/markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java index 89bc1c2..aec8020 100644 --- a/markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java +++ b/markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; +import com.nflabs.zeppelin.interpreter.InterpreterUtils; import org.markdown4j.Markdown4jProcessor; import com.nflabs.zeppelin.interpreter.Interpreter; @@ -45,7 +46,7 @@ public class Markdown extends Interpreter { try { html = md.process(st); } catch (IOException | java.lang.RuntimeException e) { - return new InterpreterResult(Code.ERROR, e.getMessage()); + return new InterpreterResult(Code.ERROR, InterpreterUtils.getMostRelevantMessage(e)); } return new InterpreterResult(Code.SUCCESS, "%html " + html); } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c7c28ccf/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java index 6177322..89c6e45 100644 --- a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import com.nflabs.zeppelin.interpreter.*; import org.apache.spark.HttpServer; import org.apache.spark.SparkConf; import org.apache.spark.SparkContext; @@ -48,14 +49,7 @@ import scala.tools.nsc.interpreter.Completion.ScalaCompleter; import scala.tools.nsc.settings.MutableSettings.BooleanSetting; import scala.tools.nsc.settings.MutableSettings.PathSetting; -import com.nflabs.zeppelin.interpreter.Interpreter; -import com.nflabs.zeppelin.interpreter.InterpreterContext; -import com.nflabs.zeppelin.interpreter.InterpreterException; -import com.nflabs.zeppelin.interpreter.InterpreterGroup; -import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder; -import com.nflabs.zeppelin.interpreter.InterpreterResult; import com.nflabs.zeppelin.interpreter.InterpreterResult.Code; -import com.nflabs.zeppelin.interpreter.WrappedInterpreter; import com.nflabs.zeppelin.scheduler.Scheduler; import com.nflabs.zeppelin.scheduler.SchedulerFactory; import com.nflabs.zeppelin.spark.dep.DependencyContext; @@ -542,7 +536,7 @@ public class SparkInterpreter extends Interpreter { } catch (Exception e) { sc.clearJobGroup(); logger.info("Interpreter exception", e); - return new InterpreterResult(Code.ERROR, e.getMessage()); + return new InterpreterResult(Code.ERROR, InterpreterUtils.getMostRelevantMessage(e)); } r = getResultCode(res); http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c7c28ccf/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java index 32f5f4e..98947eb 100644 --- a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java +++ b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java @@ -7,6 +7,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import com.nflabs.zeppelin.interpreter.*; import org.apache.spark.SparkContext; import org.apache.spark.scheduler.ActiveJob; import org.apache.spark.scheduler.DAGScheduler; @@ -25,14 +26,7 @@ import scala.collection.JavaConverters; import scala.collection.mutable.HashMap; import scala.collection.mutable.HashSet; -import com.nflabs.zeppelin.interpreter.Interpreter; -import com.nflabs.zeppelin.interpreter.InterpreterContext; -import com.nflabs.zeppelin.interpreter.InterpreterException; -import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder; -import com.nflabs.zeppelin.interpreter.InterpreterResult; import com.nflabs.zeppelin.interpreter.InterpreterResult.Code; -import com.nflabs.zeppelin.interpreter.LazyOpenInterpreter; -import com.nflabs.zeppelin.interpreter.WrappedInterpreter; import com.nflabs.zeppelin.scheduler.Scheduler; import com.nflabs.zeppelin.scheduler.SchedulerFactory; @@ -96,7 +90,6 @@ public class SparkSqlInterpreter extends Interpreter { @Override public void close() {} - @Override public InterpreterResult interpret(String st, InterpreterContext context) { SQLContext sqlc = null; @@ -123,7 +116,7 @@ public class SparkSqlInterpreter extends Interpreter { } catch (Exception e) { logger.error("Error", e); sc.clearJobGroup(); - return new InterpreterResult(Code.ERROR, e.getMessage()); + return new InterpreterResult(Code.ERROR, InterpreterUtils.getMostRelevantMessage(e)); } String msg = null; http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c7c28ccf/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterUtils.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterUtils.java b/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterUtils.java new file mode 100644 index 0000000..fb87175 --- /dev/null +++ b/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterUtils.java @@ -0,0 +1,36 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.nflabs.zeppelin.interpreter; + +import java.lang.reflect.InvocationTargetException; + +/** + * Interpreter utility functions + */ +public class InterpreterUtils { + + public static String getMostRelevantMessage(Exception ex) { + if (ex instanceof InvocationTargetException) { + Throwable cause = ((InvocationTargetException) ex).getCause(); + if (cause != null) { + return cause.getMessage(); + } + } + return ex.getMessage(); + } +}
