Skip to content

[FLINK-35301][cdc] fix deadlock when loading driver classes #3300

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

Merged
leonardBang merged 1 commit into from
May 27, 2024
Merged

[FLINK-35301][cdc] fix deadlock when loading driver classes #3300

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
3 changes: 3 additions & 0 deletions ...org/apache/flink/cdc/connectors/base/relational/connection/JdbcConnectionPoolFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import com.zaxxer.hikari.HikariDataSource;
import io.debezium.jdbc.JdbcConfiguration;

import java.sql.DriverManager;

/** A connection pool factory to create pooled DataSource {@link HikariDataSource}. */
public abstract class JdbcConnectionPoolFactory {

Expand All @@ -43,6 +45,7 @@ public HikariDataSource createPooledDataSource(JdbcSourceConfig sourceConfig) {
config.setMinimumIdle(MINIMUM_POOL_SIZE);
config.setMaximumPoolSize(sourceConfig.getConnectionPoolSize());
config.setConnectionTimeout(sourceConfig.getConnectTimeout().toMillis());
DriverManager.getDrivers();
Copy link
Contributor

@leonardBang leonardBang May 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a note for this?

Copy link
Contributor Author

@Shawn-Hx Shawn-Hx May 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I have added a description in this PR.

config.setDriverClassName(sourceConfig.getDriverClassName());

// note: the following properties should be optional (only applied to MySQL)
Expand Down
2 changes: 2 additions & 0 deletions .../flink-connector-mysql-cdc/src/main/java/io/debezium/connector/mysql/MySqlConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Duration;
Expand Down Expand Up @@ -622,6 +623,7 @@ public MySqlConnectionConfiguration(Configuration config, Properties jdbcPropert
this.jdbcConfig = JdbcConfiguration.adapt(jdbcConfigBuilder.build());
String driverClassName = this.jdbcConfig.getString(MySqlConnectorConfig.JDBC_DRIVER);
this.urlPattern = formatJdbcUrl(jdbcProperties);
DriverManager.getDrivers();
factory =
JdbcConnection.patternBasedFactory(
urlPattern, driverClassName, getClass().getClassLoader());
Expand Down
2 changes: 2 additions & 0 deletions ...java/org/apache/flink/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.zaxxer.hikari.HikariDataSource;
import io.debezium.connector.mysql.MySqlConnectorConfig;

import java.sql.DriverManager;
import java.util.Properties;

/** A connection pool factory to create pooled DataSource {@link HikariDataSource}. */
Expand Down Expand Up @@ -52,6 +53,7 @@ public static HikariDataSource createPooledDataSource(MySqlSourceConfig sourceCo
config.setMaximumPoolSize(sourceConfig.getConnectionPoolSize());
config.setConnectionTimeout(sourceConfig.getConnectTimeout().toMillis());
config.addDataSourceProperty(SERVER_TIMEZONE_KEY, sourceConfig.getServerTimeZone());
DriverManager.getDrivers();
config.setDriverClassName(
sourceConfig.getDbzConfiguration().getString(MySqlConnectorConfig.JDBC_DRIVER));

Expand Down