zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jongy...@apache.org
Subject zeppelin git commit: [HOTFIX] Disabled to close interpreters when option is shared globally
Date Mon, 20 Mar 2017 10:15:09 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.7 ed5c9a8d1 -> 9f1135380


[HOTFIX] Disabled to close interpreters when option is shared globally

### What is this PR for?
Avoid closing interpreter in shared mode

### What type of PR is it?
[Hot Fix]

### Todos
* [x] - Disable that feature no to work in shared mode

### What is the Jira issue?
N/A

### How should this be tested?
N/A

### 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: Jongyoul Lee <jongyoul@gmail.com>

Closes #2165 from jongyoul/hotfix/disable-remove-interpreters-in-shared-mode-branch-0.7 and
squashes the following commits:

857063c [Jongyoul Lee] Disabled to close interpreters when option is shared globally


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

Branch: refs/heads/branch-0.7
Commit: 9f1135380c4dba42f1a30396616d6013f36ba62d
Parents: ed5c9a8
Author: Jongyoul Lee <jongyoul@gmail.com>
Authored: Mon Mar 20 17:55:08 2017 +0900
Committer: Jongyoul Lee <jongyoul@apache.org>
Committed: Mon Mar 20 19:15:02 2017 +0900

----------------------------------------------------------------------
 .../zeppelin/interpreter/InterpreterSettingManager.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9f113538/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 1832564..98cfb08 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
@@ -799,7 +799,12 @@ public class InterpreterSettingManager {
 
   public void removeInterpretersForNote(InterpreterSetting interpreterSetting, String user,
       String noteId) {
-    interpreterSetting.closeAndRemoveInterpreterGroup(noteId, "");
+    //TODO(jl): This is only for hotfix. You should fix it as a beautiful way
+    InterpreterOption interpreterOption = interpreterSetting.getOption();
+    if (!(InterpreterOption.SHARED.equals(interpreterOption.perNote)
+        && InterpreterOption.SHARED.equals(interpreterOption.perUser))) {
+      interpreterSetting.closeAndRemoveInterpreterGroup(noteId, "");
+    }
   }
 
   public String getInterpreterSessionKey(String user, String noteId, InterpreterSetting setting)
{


Mime
View raw message