You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/09/15 01:30:48 UTC

zeppelin git commit: [ZEPPELIN-1417] Bugfix of "Connect to existing process"

Repository: zeppelin
Updated Branches:
  refs/heads/master 439b76c2c -> 383402dc6


[ZEPPELIN-1417] Bugfix of "Connect to existing process"

### What is this PR for?
This PR fixes [ZEPPELIN-1417](https://issues.apache.org/jira/browse/ZEPPELIN-1417
).

### What type of PR is it?
Bug Fix

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1417

### How should this be tested?
1. click `edit` whatever interpreter you want on interpreter setting page.
2. check the `Connect to existing process` and set `host` or `port` value.
3. uncheck the `Connect to existing process` and save
4. run paragraph with just you saved interpreter.

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: astroshim <hs...@nflabs.com>

Closes #1411 from astroshim/ZEPPELIN-1417 and squashes the following commits:

0ff0f4e [astroshim] remove isConnectExistingProcess()
c84046c [astroshim] change to create local interpreter when option is false.


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/383402dc
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/383402dc
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/383402dc

Branch: refs/heads/master
Commit: 383402dc69a9ecc8a34cd0f9ebaf4732c51d36d7
Parents: 439b76c
Author: astroshim <hs...@nflabs.com>
Authored: Wed Sep 14 09:57:36 2016 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Wed Sep 14 18:30:44 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/zeppelin/interpreter/InterpreterFactory.java | 2 +-
 .../java/org/apache/zeppelin/interpreter/InterpreterOption.java  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/383402dc/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
index ab67b5b..362f76c 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
@@ -672,7 +672,7 @@ public class InterpreterFactory implements InterpreterGroupFactory {
     Interpreter interpreter;
     for (InterpreterInfo info : interpreterInfos) {
       if (option.isRemote()) {
-        if (option.isConnectExistingProcess()) {
+        if (option.isExistingProcess()) {
           interpreter =
               connectToRemoteRepl(noteId, info.getClassName(), option.getHost(), option.getPort(),
                   properties);

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/383402dc/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
index 2bcc4c6..d013a88 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
@@ -85,10 +85,6 @@ public class InterpreterOption {
     this.perNoteSession = perNoteSession;
   }
 
-  public boolean isConnectExistingProcess() {
-    return (host != null && port != -1);
-  }
-
   public String getHost() {
     return host;
   }