You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2019/08/13 07:20:22 UTC

[zeppelin] branch master updated: [ZEPPELIN-4150] Livy interpreter session auto restart doesn't work with livy 0.6.0

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 a47f8e1  [ZEPPELIN-4150] Livy interpreter session auto restart doesn't work with livy 0.6.0
a47f8e1 is described below

commit a47f8e1f0d271e8b8bbd8d425cd86eba8cb92648
Author: sergeymazin <se...@pipedrive.com>
AuthorDate: Thu Jul 4 02:07:52 2019 +0300

    [ZEPPELIN-4150] Livy interpreter session auto restart doesn't work with livy 0.6.0
    
    ### What is this PR for?
    Change SESSION_NOT_FOUND_PATTERN to match JSON response body from Livy 0.6.0.
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4150
    
    ### 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: sergeymazin <se...@pipedrive.com>
    
    Closes #3396 from sergeymazin/master and squashes the following commits:
    
    f99b3488c [sergeymazin] change SESSION_NOT_FOUND_PATTERN to match JSON response body
---
 livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
index 95674ea..d47a322 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
@@ -86,7 +86,7 @@ public abstract class BaseLivyInterpreter extends Interpreter {
 
   protected static final Logger LOGGER = LoggerFactory.getLogger(BaseLivyInterpreter.class);
   private static Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
-  private static final String SESSION_NOT_FOUND_PATTERN = "\"Session '\\d+' not found.\"";
+  private static final String SESSION_NOT_FOUND_PATTERN = "(.*)\"Session '\\d+' not found.\"(.*)";
 
   protected volatile SessionInfo sessionInfo;
   private String livyURL;