[zeppelin] branch master updated: [ZEPPELIN-5140]Close RemoteInterpreter when RemoteInterpreterServer already timeout.

[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 49f2346  [ZEPPELIN-5140]Close RemoteInterpreter when RemoteInterpreterServer already timeout.
49f2346 is described below

commit 49f2346b34fa702fe3ead94febdd8dd5b07592c8
Author: zhengsl <zh...@getui.com>
AuthorDate: Sat Nov 21 16:32:00 2020 +0800

    [ZEPPELIN-5140]Close RemoteInterpreter when RemoteInterpreterServer already timeout.
    
    ### What is this PR for?
    This PR is to fix ZEPPELIN-5135.
    Close RemoteInterpreter when RemoteInterpreterServer already timeout.
    Otherwise the ProgressBar will be missing when rerun after the RemoteInterpreterServer timeout and old RemoteInterpreterGroup will always alive after GC.
    
    ### What type of PR is it?
    [Bug Fix | Improvement]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-5140
    
    ### How should this be tested?
    * First, run a paragraph using spark interpreter
    * Then, wait the TimeoutLifecycleManager to expire
    * Rerun the above paragraph, and the progress bar is missing.
    
    After the bug fixed, the above issue is solved
    
    ### 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: zhengsl <zh...@getui.com>
    
    Closes #3978 from zhengslei/master and squashes the following commits:
    
    3fdbd2676 [zhengsl] [ZEPPELIN-5140]Close RemoteInterpreter when RemoteInterpreterServer already timeout.
---
 .../org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
index f24e477..bdaf6c8 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/RemoteInterpreterEventServer.java
@@ -188,6 +188,10 @@ public class RemoteInterpreterEventServer implements RemoteInterpreterEventServi
               intpGroupId);
       return;
     }
+    // Close RemoteInterpreter when RemoteInterpreterServer already timeout.
+    // Otherwise the ProgressBar will be missing when rerun after the RemoteInterpreterServer timeout
+    // and old RemoteInterpreterGroups will always alive after GC.
+    interpreterGroup.close();
     interpreterSettingManager.removeInterpreterGroup(intpGroupId);
   }