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

Close and destroy interpreters in parallel

Browse source
This commit is contained in:
Lee moon soo 2015-07-02 12:05:23 -07:00
parent 4558417518
commit d2b1fa626b
2 changed files with 61 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java
View file

@ -18,9 +18,11 @@
package org.apache.zeppelin.interpreter;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
import org.apache.log4j.Logger;
import org.apache.zeppelin.display.AngularObjectRegistry;
/**
@ -71,14 +73,50 @@ public class InterpreterGroup extends LinkedList<Interpreter>{
}
public void close() {
for (Interpreter intp : this) {
intp.close();
List<Thread> closeThreads = new LinkedList<Thread>();
for (final Interpreter intp : this) {
Thread t = new Thread() {
public void run() {
intp.close();
}
};
t.start();
closeThreads.add(t);
}
for (Thread t : closeThreads) {
try {
t.join();
} catch (InterruptedException e) {
Logger logger = Logger.getLogger(InterpreterGroup.class);
logger.error("Can't close interpreter", e);
}
}
}
public void destroy() {
for (Interpreter intp : this) {
intp.destroy();
List<Thread> destroyThreads = new LinkedList<Thread>();
for (final Interpreter intp : this) {
Thread t = new Thread() {
public void run() {
intp.destroy();
}
};
t.start();
destroyThreads.add(t);
}
for (Thread t : destroyThreads) {
try {
t.join();
} catch (InterruptedException e) {
Logger logger = Logger.getLogger(InterpreterGroup.class);
logger.error("Can't close interpreter", e);
}
}
}
}

25
zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -546,13 +546,26 @@ public class InterpreterFactory {
public void close() {
List<Thread> closeThreads = new LinkedList<Thread>();
synchronized (interpreterSettings) {
synchronized (interpreterSettings) {
Collection<InterpreterSetting> intpsettings = interpreterSettings.values();
for (InterpreterSetting intpsetting : intpsettings) {
intpsetting.getInterpreterGroup().close();
intpsetting.getInterpreterGroup().destroy();
}
Collection<InterpreterSetting> intpsettings = interpreterSettings.values();
for (final InterpreterSetting intpsetting : intpsettings) {
Thread t = new Thread() {
public void run() {
intpsetting.getInterpreterGroup().close();
intpsetting.getInterpreterGroup().destroy();
}
};
t.start();
closeThreads.add(t);
}
}
for (Thread t : closeThreads) {
try {
t.join();
} catch (InterruptedException e) {
logger.error("Can't close interpreterGroup", e);
}
}
}