[zeppelin] branch master updated: ZEPPELIN-5197: Livy.sql interpreter fails to execute

[pr...@apache.org]

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

prabhjyotsingh 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 34631f1  ZEPPELIN-5197: Livy.sql interpreter fails to execute
34631f1 is described below

commit 34631f1dc197c40863ede837b9836a97cd01858c
Author: Prabhjyot Singh <pr...@gmail.com>
AuthorDate: Tue Jan 12 18:46:04 2021 +0530

    ZEPPELIN-5197: Livy.sql interpreter fails to execute
    
    ### What is this PR for?
    If `zeppelin.livy.concurrentSQL` is set to `false` then livy-interpreter fails with following exception:
    
    ```
    java.lang.RuntimeException: Fail to callRemoteFunction, because connection is broken
    	at org.apache.zeppelin.interpreter.remote.PooledRemoteClient.callRemoteFunction(PooledRemoteClient.java:108)
    	at org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess.callRemoteFunction(RemoteInterpreterProcess.java:98)
    	at org.apache.zeppelin.interpreter.remote.RemoteInterpreter.interpret(RemoteInterpreter.java:208)
    	at org.apache.zeppelin.notebook.Paragraph.jobRun(Paragraph.java:490)
    	at org.apache.zeppelin.notebook.Paragraph.jobRun(Paragraph.java:72)
    	at org.apache.zeppelin.scheduler.Job.run(Job.java:172)
    	at org.apache.zeppelin.scheduler.AbstractScheduler.runJob(AbstractScheduler.java:132)
    	at org.apache.zeppelin.scheduler.RemoteScheduler$JobRunner.run(RemoteScheduler.java:182)
    	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
    	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
    	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180)
    	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)
    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
    	at java.lang.Thread.run(Thread.java:748)
    ```
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5197
    
    ### How should this be tested?
    * Set `zeppelin.livy.concurrentSQL` as `false` and try executing below
    ```
    %livy.sql
    show tables
    ```
    
    ### Screenshots (if appropriate)
    N/A
    
    ### Questions:
    * Does the licenses files need update? N/A
    * Is there breaking changes for older versions? N/A
    * Does this needs documentation? N/A
    
    Author: Prabhjyot Singh <pr...@gmail.com>
    
    Closes #4019 from prabhjyotsingh/ZEPPELIN-5197 and squashes the following commits:
    
    155c3fb8c [Prabhjyot Singh] ZEPPELIN-5197: getScheduler should return super instead of null
---
 .../src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
index 50b2f92..4bf2e1e 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/LivySparkSQLInterpreter.java
@@ -229,7 +229,7 @@ public class LivySparkSQLInterpreter extends BaseLivyInterpreter {
       if (sparkInterpreter != null) {
         return sparkInterpreter.getScheduler();
       } else {
-        return null;
+        return super.getScheduler();
       }
     }
   }