You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@auron.apache.org by zh...@apache.org on 2026/06/25 02:52:37 UTC

(auron) branch master updated: [AURON #2356] Fix duplicate initialization of the FlinkAuronConfiguration object (#2357)

This is an automated email from the ASF dual-hosted git repository.

Tartarus0zm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git


The following commit(s) were added to refs/heads/master by this push:
     new 2fd447199 [AURON #2356] Fix duplicate initialization of the FlinkAuronConfiguration object (#2357)
2fd447199 is described below

commit 2fd44719943182d4504a55538749b08822046123
Author: zhangmang <zh...@163.com>
AuthorDate: Thu Jun 25 10:52:33 2026 +0800

    [AURON #2356] Fix duplicate initialization of the FlinkAuronConfiguration object (#2357)
    
    # Which issue does this PR close?
    
    Closes #2356
    
    # Rationale for this change
    - Fix duplicate initialization of the FlinkAuronConfiguration object
    
    # What changes are included in this PR?
    - Change the FlinkAuronConfiguration from being initialized on every
    call to being initialized only once.
    
    # Are there any user-facing changes?
    - No
    # How was this patch tested?
    - No
---
 .../plan/nodes/exec/stream/StreamExecCalcTest.java | 71 +++++++---------------
 .../org/apache/auron/jni/FlinkAuronAdaptor.java    |  4 +-
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecCalcTest.java b/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecCalcTest.java
index 4a5c24594..a8d878824 100644
--- a/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecCalcTest.java
+++ b/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecCalcTest.java
@@ -18,7 +18,6 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -28,8 +27,10 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.apache.auron.flink.configuration.FlinkAuronConfiguration;
 import org.apache.auron.flink.runtime.operator.FlinkAuronCalcOperator;
 import org.apache.auron.flink.table.planner.UnsupportedFlinkNodeRecorder;
+import org.apache.auron.jni.AuronAdaptor;
 import org.apache.auron.protobuf.ArrowType;
 import org.apache.auron.protobuf.FFIReaderExecNode;
 import org.apache.auron.protobuf.FilterExecNode;
@@ -445,60 +446,32 @@ class StreamExecCalcTest {
     }
 
     /**
-     * Runs {@code action} with the strict-mode {@code flink-conf.yaml} test resource pointed at
-     * by {@code FLINK_CONF_DIR}. The file disables fallback so the operator throws on conversion
-     * failure. Restores the prior environment after the action runs.
+     * Runs {@code action} with fallback disabled by mutating the cached {@link
+     * FlinkAuronConfiguration}'s backing {@link Configuration} in place.
      *
-     * <p>{@link org.apache.auron.flink.configuration.FlinkAuronConfiguration} resolves its
-     * underlying Flink config via {@link org.apache.flink.configuration.GlobalConfiguration#loadConfiguration()},
-     * which consults the {@code FLINK_CONF_DIR} environment variable; flipping that pointer is
-     * the supported way to swap configurations across test cases.
+     * <p>{@link AuronAdaptor#getInstance()} returns a process-wide singleton {@code
+     * FlinkAuronAdaptor} whose {@code FlinkAuronConfiguration} is constructed once (its backing
+     * Flink config loaded once at that point), so flipping {@code FLINK_CONF_DIR} no longer
+     * reloads it. Instead we reach into the cached config and set
+     * {@code flink.auron.failback.flink.engine.enabled=false} directly — the Flink {@link
+     * Configuration} is a mutable map, so the {@code final} field reference need not change. The
+     * key is removed in {@code finally}, restoring the default-loaded state (key absent →
+     * {@code getOptional} empty → default {@code true}) so later tests observe the cached default.
      */
     private static <T> T withStrictModeConf(java.util.concurrent.Callable<T> action) throws Exception {
-        java.net.URL yaml =
-                StreamExecCalcTest.class.getClassLoader().getResource("strict-mode-flink-conf/flink-conf.yaml");
-        assertNotNull(yaml, "strict-mode-flink-conf/flink-conf.yaml test resource must exist");
-        String confDir = new java.io.File(yaml.getFile()).getParentFile().getAbsolutePath();
-        String previous = System.getenv(org.apache.flink.configuration.ConfigConstants.ENV_FLINK_CONF_DIR);
-        java.util.Map<String, String> env = new java.util.HashMap<>(System.getenv());
-        env.put(org.apache.flink.configuration.ConfigConstants.ENV_FLINK_CONF_DIR, confDir);
-        mutateEnv(env);
+        FlinkAuronConfiguration auronConfig =
+                (FlinkAuronConfiguration) AuronAdaptor.getInstance().getAuronConfiguration();
+        Field f = FlinkAuronConfiguration.class.getDeclaredField("flinkConfig");
+        f.setAccessible(true);
+        Configuration flinkConfig = (Configuration) f.get(auronConfig);
+
+        final String key =
+                FlinkAuronConfiguration.FLINK_PREFIX + FlinkAuronConfiguration.FAIL_BACK_FLINK_ENGINE_ENABLED.key();
+        flinkConfig.setBoolean(key, false);
         try {
             return action.call();
         } finally {
-            java.util.Map<String, String> restore = new java.util.HashMap<>(System.getenv());
-            if (previous == null) {
-                restore.remove(org.apache.flink.configuration.ConfigConstants.ENV_FLINK_CONF_DIR);
-            } else {
-                restore.put(org.apache.flink.configuration.ConfigConstants.ENV_FLINK_CONF_DIR, previous);
-            }
-            mutateEnv(restore);
-        }
-    }
-
-    /** Reflectively replaces the JVM's environment map. Test-only — based on the same pattern
-     * used by {@code CommonTestUtils.setEnv} in {@code auron-flink-runtime}. */
-    @SuppressWarnings("unchecked")
-    private static void mutateEnv(java.util.Map<String, String> newEnv) {
-        try {
-            java.util.Map<String, String> currentEnv = System.getenv();
-            Field f = currentEnv.getClass().getDeclaredField("m");
-            f.setAccessible(true);
-            java.util.Map<String, String> backing = (java.util.Map<String, String>) f.get(currentEnv);
-            backing.clear();
-            backing.putAll(newEnv);
-            try {
-                Class<?> peClass = Class.forName("java.lang.ProcessEnvironment");
-                Field ci = peClass.getDeclaredField("theCaseInsensitiveEnvironment");
-                ci.setAccessible(true);
-                java.util.Map<String, String> cienv = (java.util.Map<String, String>) ci.get(null);
-                cienv.clear();
-                cienv.putAll(newEnv);
-            } catch (NoSuchFieldException ignored) {
-                // theCaseInsensitiveEnvironment is Windows-only.
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+            flinkConfig.removeKey(key);
         }
     }
 
diff --git a/auron-flink-extension/auron-flink-runtime/src/main/java/org/apache/auron/jni/FlinkAuronAdaptor.java b/auron-flink-extension/auron-flink-runtime/src/main/java/org/apache/auron/jni/FlinkAuronAdaptor.java
index d87813569..7d2f0d9c2 100644
--- a/auron-flink-extension/auron-flink-runtime/src/main/java/org/apache/auron/jni/FlinkAuronAdaptor.java
+++ b/auron-flink-extension/auron-flink-runtime/src/main/java/org/apache/auron/jni/FlinkAuronAdaptor.java
@@ -31,6 +31,8 @@ import org.apache.auron.functions.AuronUDFWrapperContext;
  */
 public class FlinkAuronAdaptor extends AuronAdaptor {
 
+    private final AuronConfiguration auronFlinkConfig = new FlinkAuronConfiguration();
+
     @Override
     public void loadAuronLib() {
         String libName = System.mapLibraryName("auron");
@@ -64,7 +66,7 @@ public class FlinkAuronAdaptor extends AuronAdaptor {
 
     @Override
     public AuronConfiguration getAuronConfiguration() {
-        return new FlinkAuronConfiguration();
+        return auronFlinkConfig;
     }
 
     @Override