[zeppelin] branch master updated: [ZEPPELIN-5228]. IPySpark unsupported environment would cause other spark interpreter fail

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 4db7531  [ZEPPELIN-5228]. IPySpark unsupported environment would cause other spark interpreter fail
4db7531 is described below

commit 4db7531374356e112e4ec752cbfde7f36c1cbd86
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Fri Jan 29 15:45:37 2021 +0800

    [ZEPPELIN-5228]. IPySpark unsupported environment would cause other spark interpreter fail
    
    ### What is this PR for?
    
    The root cause is that if ipyspark interpreter fail to open due to environment issue, it would close SparkInterpreter which close SparkContext. This PR won't do that in ipyspark interpreter's close method. This is fine, because when user click restarting interpreter button, all the sub interpreters will be closed.
    
    ### What type of PR is it?
    [Bug Fix ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5228
    
    ### 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 <zj...@apache.org>
    
    Closes #4040 from zjffdu/ZEPPELIN-5228 and squashes the following commits:
    
    d95d0e8d3 [Jeff Zhang] [ZEPPELIN-5228]. IPySpark unsupported environment would cause other spark interpreter fail
---
 .../src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java  | 3 ---
 .../src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java   | 4 +---
 .../src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java     | 2 +-
 .../src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java    | 4 ----
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
index 60611ce..e35dcd6 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
@@ -148,9 +148,6 @@ public class IPySparkInterpreter extends IPythonInterpreter {
   public void close() throws InterpreterException {
     LOGGER.info("Close IPySparkInterpreter");
     super.close();
-    if (sparkInterpreter != null) {
-      sparkInterpreter.close();
-    }
   }
 
   @Override
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java
index 29ae666..6f8c96f 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java
@@ -109,10 +109,8 @@ public class PySparkInterpreter extends PythonInterpreter {
 
   @Override
   public void close() throws InterpreterException {
+    LOGGER.info("Close PySparkInterpreter");
     super.close();
-    if (sparkInterpreter != null) {
-      sparkInterpreter.close();
-    }
   }
 
   @Override
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index 4a1f59e..5e10e14 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -207,7 +207,7 @@ public class SparkInterpreter extends AbstractInterpreter {
 
   public ZeppelinContext getZeppelinContext() {
     if (this.innerInterpreter == null) {
-      LOGGER.error("innerInterpreter is null!");
+      throw new RuntimeException("innerInterpreterContext is null");
     }
     return this.innerInterpreter.getZeppelinContext();
   }
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java
index bcd9288..27aeb52 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java
@@ -123,10 +123,6 @@ public class SparkRInterpreter extends RInterpreter {
   @Override
   public void close() throws InterpreterException {
     super.close();
-    if (this.sparkInterpreter != null) {
-      this.sparkInterpreter.close();
-      this.sparkInterpreter = null;
-    }
   }
 
   @Override