Repository: zeppelin Updated Branches: refs/heads/master 75ada89f4 -> fc44693fe
ZEPPELIN-3265. DevInterpreter doesn't work ### What is this PR for? This PR is trying the fix the bug that DevInterpreter doesn't work due the interpreter code refactoring. ### What type of PR is it? [Bug Fix ] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3265 ### How should this be tested? * Manually verify the zeppelin clock example. ### Screenshots (if appropriate) ![jietu20180226-210416-hd](https://user-images.githubusercontent.com/164491/36671998-ae453166-1b38-11e8-92da-3c812061251a.gif) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #2819 from zjffdu/ZEPPELIN-3265 and squashes the following commits: 0e85992 [Jeff Zhang] ZEPPELIN-3265. DevInterpreter doesn't work Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fc44693f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fc44693f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fc44693f Branch: refs/heads/master Commit: fc44693fe6589d9fbcb8a63a4664369bb7e2a2a3 Parents: 75ada89 Author: Jeff Zhang <zjf...@apache.org> Authored: Mon Feb 26 16:58:53 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Mon Feb 26 21:06:01 2018 +0800 ---------------------------------------------------------------------- helium-dev/pom.xml | 2 +- .../interpreter/InterpreterSettingManager.java | 3 ++- .../interpreter/ManagedInterpreterGroup.java | 18 +++++++----------- 3 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fc44693f/helium-dev/pom.xml ---------------------------------------------------------------------- diff --git a/helium-dev/pom.xml b/helium-dev/pom.xml index 77c5979..559b411 100644 --- a/helium-dev/pom.xml +++ b/helium-dev/pom.xml @@ -34,7 +34,7 @@ <name>Zeppelin: Helium development interpreter</name> <properties> - <interpreter.name>helium-dev</interpreter.name> + <interpreter.name>dev</interpreter.name> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fc44693f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java index 04d4092..0601c6f 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java @@ -403,13 +403,14 @@ public class InterpreterSettingManager { .setIntepreterSettingManager(this) .create(); - LOGGER.info("Register InterpreterSettingTemplate & InterpreterSetting: {}", + LOGGER.info("Register InterpreterSettingTemplate & Create InterpreterSetting: {}", interpreterSettingTemplate.getName()); interpreterSettingTemplates.put(interpreterSettingTemplate.getName(), interpreterSettingTemplate); InterpreterSetting interpreterSetting = new InterpreterSetting(interpreterSettingTemplate); initInterpreterSetting(interpreterSetting); + interpreterSettings.put(interpreterSetting.getName(), interpreterSetting); } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fc44693f/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java index d21a34d..e19c9ca 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/ManagedInterpreterGroup.java @@ -62,17 +62,13 @@ public class ManagedInterpreterGroup extends InterpreterGroup { LOGGER.info("Create InterpreterProcess for InterpreterGroup: " + getId()); remoteInterpreterProcess = interpreterSetting.createInterpreterProcess(id, userName, properties); - synchronized (remoteInterpreterProcess) { - if (!remoteInterpreterProcess.isRunning()) { - remoteInterpreterProcess.start(userName); - remoteInterpreterProcess.getRemoteInterpreterEventPoller() - .setInterpreterProcess(remoteInterpreterProcess); - remoteInterpreterProcess.getRemoteInterpreterEventPoller().setInterpreterGroup(this); - remoteInterpreterProcess.getRemoteInterpreterEventPoller().start(); - getInterpreterSetting().getRecoveryStorage() - .onInterpreterClientStart(remoteInterpreterProcess); - } - } + remoteInterpreterProcess.start(userName); + remoteInterpreterProcess.getRemoteInterpreterEventPoller() + .setInterpreterProcess(remoteInterpreterProcess); + remoteInterpreterProcess.getRemoteInterpreterEventPoller().setInterpreterGroup(this); + remoteInterpreterProcess.getRemoteInterpreterEventPoller().start(); + getInterpreterSetting().getRecoveryStorage() + .onInterpreterClientStart(remoteInterpreterProcess); } return remoteInterpreterProcess; }