Repository: zeppelin Updated Branches: refs/heads/master a63f04147 -> 233c09873
ZEPPELIN-3331. Use NullLifecycleManager by default ### What is this PR for? Just keep the behavior consistent with previous version. So use NullLifecycleManager by default, user need to configure zeppelin-site.xml to enable TimeoutLifecycleManager ### What type of PR is it? [ Improvement ] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3331 ### 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: Jeff Zhang <zjf...@apache.org> Closes #2878 from zjffdu/ZEPPELIN-3331 and squashes the following commits: 5c94e36 [Jeff Zhang] ZEPPELIN-3331. Use NullLifecycleManager by default Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/233c0987 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/233c0987 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/233c0987 Branch: refs/heads/master Commit: 233c09873456ac0893ce30970b7caa64204d99ca Parents: a63f041 Author: Jeff Zhang <zjf...@apache.org> Authored: Wed Mar 14 21:09:54 2018 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Sat Mar 17 19:12:23 2018 +0800 ---------------------------------------------------------------------- conf/zeppelin-site.xml.template | 2 ++ .../main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 2 +- .../apache/zeppelin/interpreter/InterpreterSettingManagerTest.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/233c0987/conf/zeppelin-site.xml.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template index d39b19c..b12a072 100755 --- a/conf/zeppelin-site.xml.template +++ b/conf/zeppelin-site.xml.template @@ -434,6 +434,7 @@ <description>Enable directory listings on server.</description> </property> +<!-- <property> <name>zeppelin.interpreter.lifecyclemanager.class</name> <value>org.apache.zeppelin.interpreter.lifecycle.TimeoutLifecycleManager</value> @@ -452,6 +453,7 @@ <value>3600000</value> <description>Milliseconds of the interpreter timeout threshold, by default it is 1 hour</description> </property> +--> <!-- <property> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/233c0987/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index bae0c38..db6e150 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -775,7 +775,7 @@ public class ZeppelinConfiguration extends XMLConfiguration { ZEPPELIN_INTERPRETER_PORTRANGE("zeppelin.interpreter.portRange", ":"), ZEPPELIN_INTERPRETER_LIFECYCLE_MANAGER_CLASS("zeppelin.interpreter.lifecyclemanager.class", - "org.apache.zeppelin.interpreter.lifecycle.TimeoutLifecycleManager"), + "org.apache.zeppelin.interpreter.lifecycle.NullLifecycleManager"), ZEPPELIN_INTERPRETER_LIFECYCLE_MANAGER_TIMEOUT_CHECK_INTERVAL( "zeppelin.interpreter.lifecyclemanager.timeout.checkinterval", 6000L), ZEPPELIN_INTERPRETER_LIFECYCLE_MANAGER_TIMEOUT_THRESHOLD( http://git-wip-us.apache.org/repos/asf/zeppelin/blob/233c0987/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java index 10dfb03..444f366 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/InterpreterSettingManagerTest.java @@ -22,6 +22,7 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.dep.Dependency; import org.apache.zeppelin.display.AngularObjectRegistryListener; import org.apache.zeppelin.helium.ApplicationEventListener; +import org.apache.zeppelin.interpreter.lifecycle.NullLifecycleManager; import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcessListener; import org.junit.Test; import org.sonatype.aether.RepositoryException; @@ -50,6 +51,7 @@ public class InterpreterSettingManagerTest extends AbstractInterpreterTest { InterpreterSetting interpreterSetting = interpreterSettingManager.getByName("test"); assertEquals("test", interpreterSetting.getName()); assertEquals("test", interpreterSetting.getGroup()); + assertTrue(interpreterSetting.getLifecycleManager() instanceof NullLifecycleManager); assertEquals(3, interpreterSetting.getInterpreterInfos().size()); // 3 other builtin properties: // * zeppelin.interpreter.output.limit
