This is an automated email from the ASF dual-hosted git repository. zjffdu pushed a commit to branch branch-0.8 in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.8 by this push: new c77f22f [ZEPPELIN-4150] Livy interpreter session auto restart doesn't work with livy 0.6.0 c77f22f is described below commit c77f22f829acf6a6745eced57328339f92fbd27e Author: sergeymazin <sergey.ma...@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 Change SESSION_NOT_FOUND_PATTERN to match JSON response body from Livy 0.6.0. [Bug Fix] * [ ] - Task * https://issues.apache.org/jira/browse/ZEPPELIN-4150 * CI pass * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: sergeymazin <sergey.ma...@pipedrive.com> Closes #3396 from sergeymazin/master and squashes the following commits: f99b3488c [sergeymazin] change SESSION_NOT_FOUND_PATTERN to match JSON response body (cherry picked from commit a47f8e1f0d271e8b8bbd8d425cd86eba8cb92648) Signed-off-by: Jeff Zhang <zjf...@apache.org> --- 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 75a116a..11d88b1 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java @@ -89,7 +89,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 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;