Fix for connection leaks that only occurred in CI

apache · Jan 14, 2025 · 397b6da · 397b6da
1 parent 816307c
commit 397b6da
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json b/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
@@ -3,6 +3,10 @@
   "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource"},
   "name":"JdkLogger"
 },
+{
+  "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"},
+  "name":"JdkLogger"
+},
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.mode.repository.standalone.jdbc.sql.JDBCRepositorySQLLoader"},
   "name":"[Lcom.fasterxml.jackson.databind.deser.BeanDeserializerModifier;"
@@ -745,6 +749,11 @@
   "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"add","parameterTypes":["long"] }, {"name":"sum","parameterTypes":[] }]
 },
+{
+  "condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask"},
+  "name":"java.util.concurrent.atomic.Striped64$Cell",
+  "fields":[{"name":"value"}]
+},
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser"},
   "name":"java.util.function.DoubleFunction",

diff --git a/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json b/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
@@ -271,7 +271,7 @@
     "condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"},
     "pattern":"\\QMETA-INF/services/org.apache.shardingsphere.infra.executor.checker.SQLExecutionChecker\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"},
+    "condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"},
     "pattern":"\\QMETA-INF/services/org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook\\E"
   }, {
     "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.sql.prepare.AbstractExecutionPrepareEngine"},

diff --git a/...org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/resource-config.json b/...org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/resource-config.json
@@ -14,6 +14,9 @@
     "pattern":"\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E"
   }]},
   "bundles":[{
+    "name":"com.sun.org.apache.xml.internal.serializer.XMLEntities",
+    "locales":["en"]
+  }, {
     "name":"com.microsoft.sqlserver.jdbc.SQLServerResource",
     "locales":["en"]
   }, {

diff --git a/...rc/test/java/org/apache/shardingsphere/test/natived/commons/proxy/ProxyTestingServer.java b/...rc/test/java/org/apache/shardingsphere/test/natived/commons/proxy/ProxyTestingServer.java
@@ -21,10 +21,12 @@
 import org.apache.curator.test.InstanceSpec;
 import org.apache.shardingsphere.proxy.Bootstrap;
 import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.awaitility.Awaitility;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This class is designed to start ShardingSphere Proxy directly in the current process,
@@ -59,7 +61,8 @@ public ProxyTestingServer(final String configAbsolutePath) {
      * Force close ShardingSphere Proxy. See {@link org.apache.shardingsphere.proxy.frontend.ShardingSphereProxy#close}.
      */
     public void close() {
-        ProxyContext.getInstance().getContextManager().close();
         completableFuture.cancel(false);
+        Awaitility.await().atMost(1L, TimeUnit.MINUTES).until(completableFuture::isDone);
+        ProxyContext.getInstance().getContextManager().close();
     }
 }
diff --git a/...c/test/java/org/apache/shardingsphere/test/natived/proxy/transactions/base/SeataTest.java b/...c/test/java/org/apache/shardingsphere/test/natived/proxy/transactions/base/SeataTest.java
@@ -25,8 +25,8 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledInNativeImage;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -48,7 +48,7 @@
 import static org.hamcrest.Matchers.nullValue;
 
 @SuppressWarnings({"SqlNoDataSourceInspection", "resource"})
-@EnabledInNativeImage
+@Disabled
 @Testcontainers
 class SeataTest {