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

Fix Ci

Browse source
This commit is contained in:
Jeff Zhang 2021-06-03 14:36:03 +08:00
parent e4a6c7146a
commit 5fc3e86543
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
View file

@ -118,7 +118,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
String envName = getProperty("zeppelin.interpreter.conda.env.name");
if (StringUtils.isNotBlank(envName)) {
activateCondaEnv(envName);
pythonExecutable = activateCondaEnv(envName);
} else {
pythonExecutable = getProperty("zeppelin.python", "python");
}
@ -195,7 +195,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
return "";
}
private void activateCondaEnv(String envName) throws IOException {
private String activateCondaEnv(String envName) throws IOException {
LOGGER.info("Activating conda env: {}", envName);
ByteArrayOutputStream stdout = new ByteArrayOutputStream();
PumpStreamHandler psh = new PumpStreamHandler(stdout);
@ -221,7 +221,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
} else {
LOGGER.info("Activate conda env successfully");
this.condaEnv = envName;
this.pythonExecutable = envName + "/bin/python";
return envName + "/bin/python";
}
}
@ -239,9 +239,11 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
FileUtils.copyURLToFile(url, new File(kernelWorkDir, kernelScript));
}
File bootstrapScriptFile = buildBootstrapScriptFile(kernelPort);
LOGGER.info("Bootstrap script file: " + bootstrapScriptFile.getAbsolutePath());
CommandLine cmd = CommandLine.parse(bootstrapScriptFile.getAbsolutePath());
CommandLine cmd = CommandLine.parse(pythonExecutable);
cmd.addArgument(kernelWorkDir.getAbsolutePath() + "/kernel_server.py");
cmd.addArgument(getKernelName());
cmd.addArgument(kernelPort + "");
Map<String, String> envs = setupKernelEnv();
jupyterKernelProcessLauncher = new JupyterKernelProcessLauncher(cmd, envs);
jupyterKernelProcessLauncher.launch();