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

should clear executors after shell execution is completed

Browse source
This commit is contained in:
Jeff Zhang 2016-07-22 14:30:31 +08:00
parent 0266c719c2
commit aa87b664c3
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
View file

@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
@ -49,7 +50,7 @@ public class ShellInterpreter extends Interpreter {
private static final String TIMEOUT_PROPERTY = "shell.command.timeout.millisecs";
private final boolean isWindows = System.getProperty("os.name").startsWith("Windows");
private final String shell = isWindows ? "cmd /c" : "bash -c";
private Map<String, DefaultExecutor> executors;
ConcurrentHashMap<String, DefaultExecutor> executors;
public ShellInterpreter(Properties property) {
super(property);
@ -58,7 +59,7 @@ public class ShellInterpreter extends Interpreter {
@Override
public void open() {
LOGGER.info("Command timeout property: {}", TIMEOUT_PROPERTY);
executors = new HashMap<String, DefaultExecutor>();
executors = new ConcurrentHashMap<String, DefaultExecutor>();
}
@Override
@ -104,16 +105,16 @@ public class ShellInterpreter extends Interpreter {
} catch (IOException e) {
LOGGER.error("Can not run " + cmd, e);
return new InterpreterResult(Code.ERROR, e.getMessage());
} finally {
executors.remove(contextInterpreter.getParagraphId());
}
}
@Override
public void cancel(InterpreterContext context) {
for (String paragraphId : executors.keySet()) {
if (paragraphId.equals(context.getParagraphId())) {
DefaultExecutor executor = executors.get(paragraphId);
executor.getWatchdog().destroyProcess();
}
DefaultExecutor executor = executors.remove(context.getParagraphId());
if (executor != null) {
executor.getWatchdog().destroyProcess();
}
}

4
shell/src/test/java/org/apache/zeppelin/shell/ShellInterpreterTest.java
View file

@ -55,6 +55,10 @@ public class ShellInterpreterTest {
result = shell.interpret("ls", context);
}
assertEquals(InterpreterResult.Code.SUCCESS, result.code());
assertTrue(shell.executors.isEmpty());
// it should be fine to cancel a statement that has been completed.
shell.cancel(context);
assertTrue(shell.executors.isEmpty());
}
@Test