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

apache · Jun 20, 2024 · 345e28b · 345e28b
1 parent f5f32c3
commit 345e28b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -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

diff --git a/...oro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java b/...oro-ams-server/src/main/java/org/apache/amoro/server/manager/SparkOptimizerContainer.java
@@ -157,8 +157,6 @@ protected String buildOptimizerStartupArgsString(Resource resource) {
 
     if (deployedOnKubernetes()) {
       addKubernetesProperties(resource, resourceSparkConf);
-    } else {
-      addYarnProperties(resourceSparkConf);
     }
     String sparkOptions = resourceSparkConf.toConfOptions();
     String proxyUser =
@@ -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())) {
@@ -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";

diff --git a/charts/amoro/values.yaml b/charts/amoro/values.yaml
@@ -266,7 +266,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:
   ##