zlosim commented on code in PR #4398:
URL: https://github.com/apache/zeppelin/pull/4398#discussion_r962573264
##########
zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java:
##########
@@ -403,28 +420,35 @@ boolean isSparkOnKubernetes(Properties
interpreterProperties) {
}
@VisibleForTesting
- String buildSparkSubmitOptions(String userName) {
- StringBuilder options = new StringBuilder();
-
- options.append(" --master k8s://https://kubernetes.default.svc";);
- options.append(" --deploy-mode client");
- if (properties.containsKey(SPARK_DRIVER_MEMORY)) {
- options.append(" --driver-memory
").append(properties.get(SPARK_DRIVER_MEMORY));
- }
+ String prepareZeppelinSparkConf(String userName) {
+ StringJoiner sparkConfSJ = new StringJoiner("|");
if (isUserImpersonated() && !StringUtils.containsIgnoreCase(userName,
"anonymous")) {
- options.append(" --proxy-user ").append(userName);
+ sparkConfSJ.add("--proxy-user");
+ sparkConfSJ.add(userName);
}
- options.append(" --conf
spark.kubernetes.namespace=").append(getInterpreterNamespace());
- options.append(" --conf spark.executor.instances=1");
- options.append(" --conf
spark.kubernetes.driver.pod.name=").append(getPodName());
- String sparkContainerImage = properties.containsKey(SPARK_CONTAINER_IMAGE)
? properties.getProperty(SPARK_CONTAINER_IMAGE) : sparkImage;
- options.append(" --conf
spark.kubernetes.container.image=").append(sparkContainerImage);
- options.append(" --conf spark.driver.bindAddress=0.0.0.0");
- options.append(" --conf
spark.driver.host=").append(getInterpreterPodDnsName());
- options.append(" --conf spark.driver.port=").append(getSparkDriverPort());
- options.append(" --conf
spark.blockManager.port=").append(getSparkBlockManagerPort());
-
- return options.toString();
+
+ for (String key : properties.stringPropertyNames()) {
+ String propValue = properties.getProperty(key);
+ if (isSparkConf(key, propValue)) {
+ sparkConfSJ.add("--conf");
Review Comment:
similar to the previous one, in
[SparkInterpreterLauncher](https://github.com/apache/zeppelin/blob/c4c580a37fde649553d336984a94bcb1b2821201/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/launcher/SparkInterpreterLauncher.java#L203)
desired output is `--conf|spark=123|--conf|spark.1=123` but can fix it to
`--conf spark=123|--conf spark.1=123` if that is really what we want, please
let me know
--
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: dev-unsubscr...@zeppelin.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
