Skip to content
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.

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

fix(jdbc-sink): set network timeout #17244

Merged
merged 3 commits into from
Jun 13, 2024
Merged

fix(jdbc-sink): set network timeout #17244

merged 3 commits into from
Jun 13, 2024

Conversation

StrikeW
Copy link
Contributor

@StrikeW StrikeW commented Jun 13, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Set connectTimeout and socketTimeout for the JDBC connection.
If timeout occurred, the connection become invalid and will recreate a new connection.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@StrikeW StrikeW requested review from fuyufjh, BugenZhao and wenym1 June 13, 2024 09:32
@github-actions github-actions bot added the type/fix Bug fix label Jun 13, 2024
@StrikeW StrikeW enabled auto-merge June 13, 2024 09:43
@BugenZhao BugenZhao added the user-facing-changes Contains changes that are visible to users label Jun 13, 2024
Comment on lines 47 to 49
// default timeout in seconds
final int CONNECTION_TIMEOUT = 30;
final int SOCKET_TIMEOUT = 300;
Copy link
Member

Choose a reason for hiding this comment

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

Shall we further allow users to configure this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can add new WITH option to allow customize the configs.

// postgres use seconds and mysql use milliseconds
int connectTimeout = isPg ? CONNECTION_TIMEOUT : CONNECTION_TIMEOUT * 1000;
int socketTimeout = isPg ? SOCKET_TIMEOUT : SOCKET_TIMEOUT * 1000;
props.setProperty("connectTimeout", String.valueOf(connectTimeout));
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of passing the value via props, I think we can create the connection with only jdbcUrl anyway and then get and reset the timeout by the methods provided in the Connection

https://docs.oracle.com/javase%2F8%2Fdocs%2Fapi%2F%2F/java/sql/Connection.html

It provides get/setNetworkTimeout method in the interface.

Copy link
Contributor Author

@StrikeW StrikeW Jun 13, 2024

Choose a reason for hiding this comment

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

setNetworkTimeout(Executor executor, int milliseconds)

I inspected the interface. But the first arg is confusing. For PG we can pass null for the executor, but for MySQL it will throw an exception if first arg is null.
These properties are well documented in the driver's doc, so this way should be reliable to set the timeout.

@StrikeW StrikeW disabled auto-merge June 13, 2024 10:04
@StrikeW StrikeW enabled auto-merge June 13, 2024 10:22
@StrikeW StrikeW added this pull request to the merge queue Jun 13, 2024
Merged via the queue into main with commit 41fe501 Jun 13, 2024
28 of 29 checks passed
@StrikeW StrikeW deleted the siyuan/jdbc-sink-timeout branch June 13, 2024 10:51
github-actions bot pushed a commit that referenced this pull request Jun 18, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Bug fix user-facing-changes Contains changes that are visible to users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants