Skip to content

Commit

Permalink
ZEPPELIN-3278. Avoid duplicated interpreter setting
Browse files Browse the repository at this point in the history
### What is this PR for?
Straightforward bugfix for ZEPPELIN-3278. Just don't create interpreter setting instance when registering from template.

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

### Todos
* [ ] - Task

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

### How should this be tested?
* CI pass

### 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 <zjffdu@apache.org>

Closes apache#2824 from zjffdu/ZEPPELIN-3278 and squashes the following commits:

6ece9ca [Jeff Zhang] [ZEPPELIN-3278] Avoid duplicated interpreter setting

(cherry picked from commit 21dc20d)
Signed-off-by: Jeff Zhang <zjffdu@apache.org>
  • Loading branch information
zjffdu committed Mar 2, 2018
1 parent 7187932 commit 3078cd4
Showing 1 changed file with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,14 @@ private void initInterpreterSetting(InterpreterSetting interpreterSetting) {
}

/**
* Load interpreter setting from interpreter-setting.json
* Load interpreter setting from interpreter.json
*/
private void loadFromFile() throws IOException {
InterpreterInfoSaving infoSaving =
configStorage.loadInterpreterSettings();
if (infoSaving == null) {
// nothing to read
// it is fresh zeppelin instance if there's no interpreter.json, just create interpreter
// setting from interpreterSettingTemplates
for (InterpreterSetting interpreterSettingTemplate : interpreterSettingTemplates.values()) {
InterpreterSetting interpreterSetting = new InterpreterSetting(interpreterSettingTemplate);
initInterpreterSetting(interpreterSetting);
Expand Down Expand Up @@ -403,14 +404,10 @@ private void registerInterpreterSetting(List<RegisteredInterpreter> registeredIn
.setIntepreterSettingManager(this)
.create();

LOGGER.info("Register InterpreterSettingTemplate & Create InterpreterSetting: {}",
LOGGER.info("Register InterpreterSettingTemplate: {}",
interpreterSettingTemplate.getName());
interpreterSettingTemplates.put(interpreterSettingTemplate.getName(),
interpreterSettingTemplate);

InterpreterSetting interpreterSetting = new InterpreterSetting(interpreterSettingTemplate);
initInterpreterSetting(interpreterSetting);
interpreterSettings.put(interpreterSetting.getName(), interpreterSetting);
}

@VisibleForTesting
Expand Down

0 comments on commit 3078cd4

Please sign in to comment.