add lock to JdbcConnectionPools.close

apache · Jul 5, 2024 · e4745e1 · e4745e1
1 parent 2153502
commit e4745e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.../java/org/apache/flink/cdc/connectors/base/relational/connection/JdbcConnectionPools.java b/.../java/org/apache/flink/cdc/connectors/base/relational/connection/JdbcConnectionPools.java
@@ -86,10 +86,12 @@ public String getJdbcUrl(
     }
 
     public static void close() throws IOException {
-        if (instance != null) {
-            instance.pools.values().stream().forEach(HikariDataSource::close);
-            instance.pools.clear();
-            POOL_FACTORY_MAP.clear();
+        synchronized (instance.pools) {
+            if (instance != null) {
+                instance.pools.values().stream().forEach(HikariDataSource::close);
+                instance.pools.clear();
+                POOL_FACTORY_MAP.clear();
+            }
         }
     }
 }
diff --git a/...ain/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java b/...ain/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java
@@ -53,10 +53,12 @@ public HikariDataSource getOrCreateConnectionPool(
         }
     }
 
-    public static void close() throws IOException {
-        if (INSTANCE != null) {
-            INSTANCE.pools.values().stream().forEach(HikariDataSource::close);
-            INSTANCE.pools.clear();
+    public static synchronized void close() throws IOException {
+        synchronized (INSTANCE.pools) {
+            if (INSTANCE != null) {
+                INSTANCE.pools.values().stream().forEach(HikariDataSource::close);
+                INSTANCE.pools.clear();
+            }
         }
     }
 }