Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix] Unlock some configs of the spark optimizer #2950

Merged
merged 1 commit into from
Jun 20, 2024
Merged

[Hotfix] Unlock some configs of the spark optimizer #2950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ body:
- type: dropdown
id: table-format
attributes:
label: What table format are you seeing the problem on?
label: What table formats are you seeing the problem on?
multiple: true
options:
- Iceberg
Expand Down
17 changes: 0 additions & 17 deletions ...oro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ protected String buildOptimizerStartupArgsString(Resource resource) {

if (deployedOnKubernetes()) {
addKubernetesProperties(resource, resourceSparkConf);
} else {
addYarnProperties(resourceSparkConf);
}
String sparkOptions = resourceSparkConf.toConfOptions();
String proxyUser =
Expand Down Expand Up @@ -224,16 +222,6 @@ private void addKubernetesProperties(
SparkConfKeys.KUBERNETES_EXECUTOR_LABEL_PREFIX + "optimizer-id", resource.getResourceId());
}

private void addYarnProperties(SparkOptimizerContainer.SparkConf sparkConf) {
// Load optimizer jar first
sparkConf.putToOptions(
SparkConfKeys.DRIVER_CLASSPATH_INCLUDE_USER_JAR,
SparkOptimizerContainer.SparkConfKeys.CLASSPATH_INCLUDE_USER_JAR_DEFAULT);
sparkConf.putToOptions(
SparkConfKeys.EXECUTOR_CLASSPATH_INCLUDE_USER_JAR,
SparkOptimizerContainer.SparkConfKeys.CLASSPATH_INCLUDE_USER_JAR_DEFAULT);
}

private <T> T fetchCommandOutput(Process exec, Function<String, T> commandReader) {
T value = null;
try (InputStreamReader inputStreamReader = new InputStreamReader(exec.getInputStream())) {
Expand Down Expand Up @@ -337,11 +325,6 @@ public String getValue() {
}

public static class SparkConfKeys {
public static final String DRIVER_CLASSPATH_INCLUDE_USER_JAR =
"spark.driver.userClassPathFirst";
public static final String EXECUTOR_CLASSPATH_INCLUDE_USER_JAR =
"spark.executor.userClassPathFirst";
public static final String CLASSPATH_INCLUDE_USER_JAR_DEFAULT = "true";
public static final String KUBERNETES_IMAGE_REF = "spark.kubernetes.container.image";
public static final String KUBERNETES_DRIVER_NAME = "spark.kubernetes.driver.pod.name";
public static final String KUBERNETES_NAMESPACE = "spark.kubernetes.namespace";
Expand Down
2 changes: 1 addition & 1 deletion charts/amoro/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ optimizer:
pullPolicy: "IfNotPresent"
extra: []

## Configure the plugin that allows you to access the metric reporters and events listeners.
## Configure the plugin that allows you to access the metric reporters and event listeners.
##
plugin:
##
Expand Down
Loading