You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/03/13 08:03:21 UTC
zeppelin git commit: ZEPPELIN-3322. Update interpreterBind when
restarting zeppelin server
Repository: zeppelin
Updated Branches:
refs/heads/master 803116fd0 -> 4463967a5
ZEPPELIN-3322. Update interpreterBind when restarting zeppelin server
### What is this PR for?
When loading interpreter.json, also update interpreterBindings as we change change interpreter setting id in ZEPPELIN-3208.
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3322
### How should this be tested?
* Unit test is added.
### 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 <zj...@apache.org>
Closes #2861 from zjffdu/ZEPPELIN-3322 and squashes the following commits:
94f4882 [Jeff Zhang] ZEPPELIN-3322. Update interpreterBind when restarting zeppelin server
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4463967a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4463967a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4463967a
Branch: refs/heads/master
Commit: 4463967a520af2bc9950fdbd2987ed220d8c0344
Parents: 803116f
Author: Jeff Zhang <zj...@apache.org>
Authored: Tue Mar 13 14:54:58 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Tue Mar 13 16:03:15 2018 +0800
----------------------------------------------------------------------
.../interpreter/InterpreterSettingManager.java | 15 ++++++++++++--
.../InterpreterSettingManagerTest.java | 6 ++++++
.../src/test/resources/conf/interpreter.json | 21 +-------------------
3 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4463967a/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 c3ec81b..9587a88 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
@@ -208,6 +208,19 @@ public class InterpreterSettingManager {
return;
}
+ // update interpreter binding first as we change interpreter setting id in ZEPPELIN-3208.
+ Map<String, List<String>> newBindingMap = new HashMap<>();
+ for (Map.Entry<String, List<String>> entry : infoSaving.interpreterBindings.entrySet()) {
+ String noteId = entry.getKey();
+ List<String> oldSettingIdList = entry.getValue();
+ List<String> newSettingIdList = new ArrayList<>();
+ for (String oldId : oldSettingIdList) {
+ newSettingIdList.add(infoSaving.interpreterSettings.get(oldId).getName());
+ }
+ newBindingMap.put(noteId, newSettingIdList);
+ }
+ interpreterBindings.putAll(newBindingMap);
+
//TODO(zjffdu) still ugly (should move all to InterpreterInfoSaving)
for (InterpreterSetting savedInterpreterSetting : infoSaving.interpreterSettings.values()) {
savedInterpreterSetting.setProperties(InterpreterSetting.convertInterpreterProperties(
@@ -259,8 +272,6 @@ public class InterpreterSettingManager {
interpreterSettings.put(savedInterpreterSetting.getId(), savedInterpreterSetting);
}
- interpreterBindings.putAll(infoSaving.interpreterBindings);
-
if (infoSaving.interpreterRepositories != null) {
for (RemoteRepository repo : infoSaving.interpreterRepositories) {
if (!dependencyResolver.getRepos().contains(repo)) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4463967a/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 a52601c..10dfb03 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
@@ -72,6 +72,12 @@ public class InterpreterSettingManagerTest extends AbstractInterpreterTest {
assertEquals(2, repositories.size());
assertEquals("central", repositories.get(0).getId());
+ // verify interpreter binding
+ List<String> interpreterSettingIds = interpreterSettingManager.getInterpreterBinding("2C6793KRV");
+ assertEquals(2, interpreterSettingIds.size());
+ assertEquals("test", interpreterSettingIds.get(0));
+ assertEquals("test2", interpreterSettingIds.get(1));
+
// Load it again
InterpreterSettingManager interpreterSettingManager2 = new InterpreterSettingManager(conf,
mock(AngularObjectRegistryListener.class), mock(RemoteInterpreterProcessListener.class), mock(ApplicationEventListener.class));
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4463967a/zeppelin-zengine/src/test/resources/conf/interpreter.json
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/resources/conf/interpreter.json b/zeppelin-zengine/src/test/resources/conf/interpreter.json
index 0c5e829..528921c 100644
--- a/zeppelin-zengine/src/test/resources/conf/interpreter.json
+++ b/zeppelin-zengine/src/test/resources/conf/interpreter.json
@@ -124,27 +124,8 @@
},
"interpreterBindings": {
"2C6793KRV": [
- "2C48Y7FSJ",
- "2C63XW4XE",
- "2C66GE1VB",
- "2C5VH924X",
- "2C4BJDRRZ",
- "2C3SQSB7V",
- "2C4HKDCQW",
- "2C3DR183X",
- "2C66Z9XPQ",
- "2C3PTPMUH",
- "2C69WE69N",
- "2C5SRRXHM",
- "2C4ZD49PF",
- "2C6V3D44K",
- "2C4UB1UZA",
- "2C5S1R21W",
- "2C5DCRVGM",
- "2C686X8ZH",
"2C3RWCVAG",
- "2C3JKFMJU",
- "2C3VECEG2"
+ "2CKWE7B19"
]
},
"interpreterRepositories": [