zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: ZEPPELIN-3815. No interpreter group name in spark interpreter log file
Date Wed, 14 Nov 2018 07:25:14 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master b983304c0 -> a7f3f3c55


ZEPPELIN-3815. No interpreter group name in spark interpreter log file

### What is this PR for?
Trivial PR for fixing group name missing in spark interpreter log file

### What type of PR is it?
[ Hot Fix ]

### Todos
* [ ] - Task

### What is the Jira issue?
* https://jira.apache.org/jira/browse/ZEPPELIN-3815

### How should this be tested?
* CI pass

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? NO
* Does this needs documentation? No

Author: Jeff Zhang <zjffdu@apache.org>

Closes #3222 from zjffdu/ZEPPELIN-3815 and squashes the following commits:

c1fee0326 [Jeff Zhang] ZEPPELIN-3815. No interpreter group name in spark interpreter log file


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

Branch: refs/heads/master
Commit: a7f3f3c558e8376d7bde5e5ac1f4558bd88b7dd5
Parents: b983304
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Wed Oct 17 21:04:48 2018 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Wed Nov 14 15:25:09 2018 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/zeppelin/util/Util.java               | 2 +-
 .../zeppelin/interpreter/launcher/SparkInterpreterLauncher.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a7f3f3c5/zeppelin-interpreter/src/main/java/org/apache/zeppelin/util/Util.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/util/Util.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/util/Util.java
index 6153f49..e36afca 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/util/Util.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/util/Util.java
@@ -39,7 +39,7 @@ public class Util {
     try {
       projectProperties.load(Util.class.getResourceAsStream("/project.properties"));
       gitProperties.load(Util.class.getResourceAsStream("/git.properties"));
-    } catch (IOException e) {
+    } catch (Exception e) {
       //Fail to read project.properties
     }
   }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a7f3f3c5/zeppelin-plugins/launcher/spark/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
----------------------------------------------------------------------
diff --git a/zeppelin-plugins/launcher/spark/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
b/zeppelin-plugins/launcher/spark/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
index bcf319a..1bf446f 100644
--- a/zeppelin-plugins/launcher/spark/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
+++ b/zeppelin-plugins/launcher/spark/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java
@@ -47,7 +47,7 @@ public class SparkInterpreterLauncher extends StandardInterpreterLauncher
{
 
   @Override
   protected Map<String, String> buildEnvFromProperties(InterpreterLaunchContext context)
{
-    Map<String, String> env = new HashMap<String, String>();
+    Map<String, String> env = super.buildEnvFromProperties(context);
     Properties sparkProperties = new Properties();
     String sparkMaster = getSparkMaster(properties);
     for (String key : properties.stringPropertyNames()) {


Mime
View raw message