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 edfe3eb [minor] Minor code clean edfe3eb is described below commit edfe3eb83e8f61a5b1fc5f6663c0c26e4d634857 Author: Jeff Zhang <zjf...@apache.org> AuthorDate: Mon Dec 9 10:03:25 2019 +0800 [minor] Minor code clean --- .../main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java | 3 +-- .../org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java index 28cdb3e..16242be 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.concurrent.ExecutorService; /** - * Factory class for creating schedulers except RemoteScheduler as RemoteScheudler runs in + * Factory class for creating schedulers except RemoteScheduler as RemoteScheduler runs in * zeppelin server process instead of interpreter process. * */ @@ -116,5 +116,4 @@ public class SchedulerFactory { public ExecutorService getExecutor() { return executor; } - } diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java index a03aacf..297024a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java @@ -389,14 +389,10 @@ public class RemoteInterpreter extends Interpreter { @Override public Scheduler getScheduler() { - int maxConcurrency = Integer.parseInt( - getProperty("zeppelin.interpreter.max.poolsize", - ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_MAX_POOL_SIZE.getIntValue() + "")); // one session own one Scheduler, so that when one session is closed, all the jobs/paragraphs // running under the scheduler of this session will be aborted. Scheduler s = new RemoteScheduler( - RemoteInterpreter.class.getSimpleName() + "-" + getInterpreterGroup().getId() + "-" - + sessionId, + RemoteInterpreter.class.getSimpleName() + getInterpreterGroup().getId(), SchedulerFactory.singleton().getExecutor(), this); return SchedulerFactory.singleton().createOrGetScheduler(s);