Skip to content

fix(connection): SingleConnectionDataSource concurrent getConnection may have problems #1914

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
yhilmare merged 3 commits into from
Mar 15, 2024
Merged

fix(connection): SingleConnectionDataSource concurrent getConnection may have problems #1914

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c637768
fix concurrent
ungreat Mar 15, 2024
c762685
fix concurrent
ungreat Mar 15, 2024
620f271
fix concurrent
ungreat Mar 15, 2024
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
6 changes: 3 additions & 3 deletions .../odc-core/src/main/java/com/oceanbase/odc/core/datasource/SingleConnectionDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class SingleConnectionDataSource extends BaseClassBasedDataSource impleme
private final boolean autoReconnect;
@Setter
private EventPublisher eventPublisher;
protected Connection connection;
protected volatile Connection connection;
private final List<ConnectionInitializer> initializerList = new LinkedList<>();
private Lock lock;
@Setter
Expand Down Expand Up @@ -96,7 +96,7 @@ public Connection getConnection(String username, String password) throws SQLExce
/**
* Reset a {@code Connection}
*/
public void resetConnection() throws SQLException {
public synchronized void resetConnection() throws SQLException {
log.info("The connection will be reset soon");
close();
this.connection = null;
Expand Down Expand Up @@ -181,7 +181,7 @@ private void onConnectionReset(Connection connection) {
}
}

private Connection innerCreateConnection() throws SQLException {
private synchronized Connection innerCreateConnection() throws SQLException {
if (this.connection != null) {
throw new IllegalStateException("Connection is not null");
}
Expand Down