Remove fork option
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/78691e8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/78691e8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/78691e8c Branch: refs/heads/master Commit: 78691e8c343a795da916e06787956c5b401d2bc3 Parents: 39e1217 Author: Lee moon soo <[email protected]> Authored: Fri Mar 13 12:35:21 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Fri Mar 13 12:35:21 2015 +0900 ---------------------------------------------------------------------- zeppelin-web/app/views/interpreter.html | 21 -------------------- .../interpreter/InterpreterFactory.java | 6 ++++++ 2 files changed, 6 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78691e8c/zeppelin-web/app/views/interpreter.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/app/views/interpreter.html b/zeppelin-web/app/views/interpreter.html index b291830..dbc3a82 100644 --- a/zeppelin-web/app/views/interpreter.html +++ b/zeppelin-web/app/views/interpreter.html @@ -61,13 +61,6 @@ limitations under the License. </select> </div> - <div class="form-group"> - <b toolip-placement="top" tooltip="Run interpreter in separate JVM process. If you're not sure, keep it checked.">Fork</b> - <input type="checkbox" - ng-model="newInterpreterSetting.option.remote"> - </input> - </div> - <b>Properties</b> <table class="table table-striped properties"> <tr> @@ -150,20 +143,6 @@ limitations under the License. <br /> <div class="row interpreter"> <div class="col-md-12"> - <div ng-if="!valueform.$visible"> - <b>Fork</b> - {{setting.option.remote}} - </div> - <div ng-if="valueform.$visible"> - <b toolip-placement="top" tooltip="Run interpreter in separate JVM process. If you're not sure, keep it checked.">Fork</b> - <input type="checkbox" - ng-model="setting.option.remote"> - </input> - </div> - </div> - </div> - <br /> - <div class="row interpreter"> - <div class="col-md-12"> <b>Properties</b> <table class="table table-striped"> <tr> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/78691e8c/zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java b/zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java index 821c7be..b7c190f 100644 --- a/zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java +++ b/zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java @@ -194,6 +194,11 @@ public class InterpreterFactory { for (String k : info.interpreterSettings.keySet()) { InterpreterSetting setting = info.interpreterSettings.get(k); + // Always use separate interpreter process + // While we decided to turn this feature on always (without providing enable/disable option on GUI). + // previously created setting should turn this feature on here. + setting.getOption().setRemote(true); + InterpreterGroup interpreterGroup = createInterpreterGroup( setting.getGroup(), setting.getOption(), @@ -325,6 +330,7 @@ public class InterpreterFactory { if (info.getClassName().equals(className) && info.getGroup().equals(groupName)) { Interpreter intp; + if (option.isRemote()) { intp = createRemoteRepl(info.getPath(), info.getClassName(),
