apache
diff --git a/‎python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java‎
Lines changed: 18 additions & 10 deletions b/‎python/src/main/java/org/apache/zeppelin/python/PythonInterpreter.java‎
Lines changed: 18 additions & 10 deletions
diff --git a/‎spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java‎
Lines changed: 9 additions & 7 deletions b/‎spark/interpreter/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java‎
Lines changed: 9 additions & 7 deletions
diff --git a/‎spark/interpreter/src/test/java/org/apache/zeppelin/spark/IPySparkInterpreterTest.java‎
Lines changed: 1 addition & 0 deletions b/‎spark/interpreter/src/test/java/org/apache/zeppelin/spark/IPySparkInterpreterTest.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java‎
Lines changed: 1 addition & 0 deletions b/‎zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java‎
Lines changed: 1 addition & 0 deletions
@@ -80,16 +80,24 @@ public PythonInterpreter(Properties property) {
   public void open() throws InterpreterException {
     // try IPythonInterpreter first
     iPythonInterpreter = getIPythonInterpreter();
-    if (getProperty("zeppelin.python.useIPython", "true").equals("true") &&
-        StringUtils.isEmpty(
-            iPythonInterpreter.checkKernelPrerequisite(getPythonExec()))) {
-      try {
-        iPythonInterpreter.open();
-        LOGGER.info("IPython is available, Use IPythonInterpreter to replace PythonInterpreter");
-        return;
-      } catch (Exception e) {
-        iPythonInterpreter = null;
-        LOGGER.warn("Fail to open IPythonInterpreter", e);
+    boolean useIPython = Boolean.parseBoolean(getProperty("zeppelin.python.useIPython", "true"));
+
+    LOGGER.info("zeppelin.python.useIPython: {}", useIPython);
+    if (useIPython) {
+      String checkKernelPrerequisiteResult = iPythonInterpreter.checkKernelPrerequisite(
+              getPythonExec());
+      if (StringUtils.isEmpty(checkKernelPrerequisiteResult)) {
+        try {
+          iPythonInterpreter.open();
+          LOGGER.info("IPython is available, Use IPythonInterpreter to replace PythonInterpreter");
+          return;
+        } catch (Exception e) {
+          iPythonInterpreter = null;
+          LOGGER.warn("Fail to open IPythonInterpreter", e);
+        }
+      } else {
+        LOGGER.info("IPython requirement is not met, checkKernelPrerequisiteResult: {}",
+                checkKernelPrerequisiteResult);
       }
     }
 
 
@@ -171,18 +171,20 @@ public void setInterpreterContextInPython() {
   // spark.pyspark.driver.python > spark.pyspark.python > PYSPARK_DRIVER_PYTHON > PYSPARK_PYTHON
   @Override
   protected String getPythonExec() {
-    if (!StringUtils.isBlank(getProperty("spark.pyspark.driver.python", ""))) {
-      return properties.getProperty("spark.pyspark.driver.python");
+    SparkConf sparkConf = getSparkConf();
+    if (StringUtils.isNotBlank(sparkConf.get("spark.pyspark.driver.python", ""))) {
+      return sparkConf.get("spark.pyspark.driver.python");
     }
-    if (!StringUtils.isBlank(getProperty("spark.pyspark.python", ""))) {
-      return properties.getProperty("spark.pyspark.python");
-    }
-    if (System.getenv("PYSPARK_PYTHON") != null) {
-      return System.getenv("PYSPARK_PYTHON");
+    if (StringUtils.isNotBlank(sparkConf.get("spark.pyspark.python", ""))) {
+      return sparkConf.get("spark.pyspark.python");
     }
     if (System.getenv("PYSPARK_DRIVER_PYTHON") != null) {
       return System.getenv("PYSPARK_DRIVER_PYTHON");
     }
+    if (System.getenv("PYSPARK_PYTHON") != null) {
+      return System.getenv("PYSPARK_PYTHON");
+    }
+
     return "python";
   }
 
 
@@ -90,6 +90,7 @@ protected void startInterpreter(Properties properties) throws InterpreterExcepti
     intpGroup.get("session_1").add(interpreter);
     interpreter.setInterpreterGroup(intpGroup);
 
+    pySparkInterpreter.open();
     interpreter.open();
   }
 
 
@@ -153,6 +153,7 @@ public void open() throws InterpreterException {
    * @return check result of checking kernel prerequisite.
    */
   public String checkKernelPrerequisite(String pythonExec) {
+    LOGGER.info("checkKernelPrerequisite using python executable: {}", pythonExec);
     ProcessBuilder processBuilder = new ProcessBuilder(pythonExec, "-m", "pip", "freeze");
     File stderrFile = null;
     File stdoutFile = null;
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ protected void startInterpreter(Properties properties) throws InterpreterExcepti`
`90`	`90`	`intpGroup.get("session_1").add(interpreter);`
`91`	`91`	`interpreter.setInterpreterGroup(intpGroup);`
`92`	`92`
	`93`	`+ pySparkInterpreter.open();`
`93`	`94`	`interpreter.open();`
`94`	`95`	`}`
`95`	`96`