[zeppelin] branch master updated: [ZEPPELIN-4691]restart interpreter blocked after interpreter process exited unexpectedly

[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 b0a26b4  [ZEPPELIN-4691]restart interpreter blocked after interpreter process exited unexpectedly
b0a26b4 is described below

commit b0a26b465559c1a74b13974ea5403020e53ede74
Author: xiejiajun <xi...@163.com>
AuthorDate: Fri Mar 20 22:00:05 2020 +0800

    [ZEPPELIN-4691]restart interpreter blocked after interpreter process exited unexpectedly
    
    ### What is this PR for?
    - added timeout for getting Thrift client to avoid situations where the interpreter may not be restarted when the interpreter process exits unexpectedly
    
    ### What type of PR is it?
    - Bug Fix
    
    ### What is the Jira issue?
    - https://issues.apache.org/jira/browse/ZEPPELIN-4691
    
    ### Questions:
    * Does the licenses files need update? NO
    * Is there breaking changes for older versions? NO
    * Does this needs documentation? NO
    
    Author: xiejiajun <xi...@163.com>
    
    Closes #3695 from xiejiajun/branch-0.9 and squashes the following commits:
    
    9b3c744a0 [xiejiajun] added timeout for getting Thrift client to avoid situations where the interpreter may not be restarted when the interpreter process exits unexpectedly
---
 .../apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
index 441dc76..de6b157 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
@@ -48,7 +48,7 @@ public abstract class RemoteInterpreterProcess implements InterpreterClient {
       clientFactory = new ClientFactory(getHost(), getPort());
       clientPool = new GenericObjectPool<>(clientFactory);
     }
-    return clientPool.borrowObject();
+    return clientPool.borrowObject(5_000);
   }
 
   public void shutdown() {