pan3793 commented on code in PR #4780:
URL: https://github.com/apache/zeppelin/pull/4780#discussion_r1717058271
##########
zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java:
##########
@@ -441,18 +450,20 @@ private void copyRunFileToContainer(String containerId)
HashMap<String, String> copyFiles = new HashMap<>();
// Rebuild directory
- rmInContainer(containerId, zeppelinHome);
- mkdirInContainer(containerId, zeppelinHome);
+ rmInContainer(containerId, containerZeppelinHome);
+ mkdirInContainer(containerId, containerZeppelinHome);
// 1) zeppelin-site.xml is uploaded to `${CONTAINER_ZEPPELIN_HOME}`
directory in the container
String confPath = "/conf";
String zeplConfPath = getPathByHome(zeppelinHome, confPath);
- mkdirInContainer(containerId, zeplConfPath);
- copyFiles.put(zeplConfPath + "/zeppelin-site.xml", zeplConfPath +
"/zeppelin-site.xml");
- copyFiles.put(zeplConfPath + "/log4j.properties", zeplConfPath +
"/log4j.properties");
+ mkdirInContainer(containerId, containerZeppelinHome);
+ String containerZeplConfPath = containerZeppelinHome + confPath;
+ copyFiles.put(
+ zeplConfPath + "/zeppelin-site.xml", containerZeplConfPath +
"/zeppelin-site.xml");
+ copyFiles.put(zeplConfPath + "/log4j.properties", containerZeplConfPath +
"/log4j.properties");
copyFiles.put(zeplConfPath + "/log4j_yarn_cluster.properties",
- zeplConfPath + "/log4j_yarn_cluster.properties");
+ containerZeplConfPath + "/log4j_yarn_cluster.properties");
Review Comment:
this won't work for Spark 3.5, because SPARK-6305 (fixed in Spark 3.3)
migrated from log4j 1 to log4j 2, thing will be simple after we drop support
for Spark 3.2, anyway, this is another issue, let's keep it as-is for now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@zeppelin.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
