Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed to run "per user" as "isolated"

Browse source
This commit is contained in:
Jongyoul Lee 2017-03-17 13:28:44 +09:00
parent dcee15afc3
commit 9d5b4b464b
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
View file

@ -935,24 +935,8 @@ public class InterpreterSettingManager {
InterpreterSetting intpSetting = interpreterSettings.get(settingId);
Preconditions.checkNotNull(intpSetting);
// restart interpreter setting in note page
if (noteIdIsExist(noteId) && intpSetting.getOption().isProcess()) {
intpSetting.closeAndRemoveInterpreterGroupByNoteId(noteId);
return;
} else {
// restart interpreter setting in interpreter setting page
restart(settingId, user);
}
}
private boolean noteIdIsExist(String noteId) {
return noteId == null ? false : true;
}
public void restart(String id, String user) {
synchronized (interpreterSettings) {
InterpreterSetting intpSetting = interpreterSettings.get(id);
intpSetting = interpreterSettings.get(settingId);
// Check if dependency in specified path is changed
// If it did, overwrite old dependency jar with new one
if (intpSetting != null) {
@ -968,13 +952,13 @@ public class InterpreterSettingManager {
}
} else {
throw new InterpreterException("Interpreter setting id " + id + " not found");
throw new InterpreterException("Interpreter setting id " + settingId + " not found");
}
}
}
public void restart(String id) {
restart(id, "anonymous");
restart(id, "", "anonymous");
}
private void stopJobAllInterpreter(InterpreterSetting intpSetting) {

8
zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
View file

@ -925,8 +925,8 @@ public class NotebookTest implements JobListenerFactory{
// restart interpreter with scoped mode enabled
for (InterpreterSetting setting : notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId())) {
setting.getOption().setPerNote(InterpreterOption.SCOPED);
notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId());
notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId());
notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId(), anonymous.getUser());
notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId(), anonymous.getUser());
}
// run per note session enabled
@ -941,8 +941,8 @@ public class NotebookTest implements JobListenerFactory{
// restart interpreter with isolated mode enabled
for (InterpreterSetting setting : notebook.getInterpreterSettingManager().getInterpreterSettings(note1.getId())) {
setting.getOption().setPerNote(InterpreterOption.ISOLATED);
notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId());
notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId());
notebook.getInterpreterSettingManager().restart(setting.getId(), note1.getId(), anonymous.getUser());
notebook.getInterpreterSettingManager().restart(setting.getId(), note2.getId(), anonymous.getUser());
}
// run per note process enabled