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.

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

Jump to bottom

Reset socketTimeout to original value after a successful connection open #2355

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Reset socketTimeout to original value after a successful connection open #2355

merged 2 commits into from
Mar 26, 2024

Conversation

tkyc
Copy link
Member

@tkyc tkyc commented Mar 19, 2024

@tkyc tkyc added this to the 12.7.0 milestone Mar 19, 2024
@tkyc tkyc linked an issue Mar 19, 2024 that may be closed by this pull request
loginTimouts overwrites socketTimeout for SELECTs #2354
Closed
@codecov Codecov
Copy link

codecov bot commented Mar 19, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 49.74359% with 98 lines in your changes are missing coverage. Please review.

Project coverage is 50.08%. Comparing base (00a2556) to head (731678a).
Report is 5 commits behind head on main.

❗ Current head 731678a differs from pull request most recent head 92f22cd. Consider uploading reports for the commit 92f22cd to get more accurate results

Files Patch % Lines
...microsoft/sqlserver/jdbc/SQLServerMSAL4JUtils.java 0.00% 41 Missing ⚠️
...a/com/microsoft/sqlserver/jdbc/SQLServerError.java 32.14% 17 Missing and 2 partials ⚠️
...microsoft/sqlserver/jdbc/SQLServerInfoMessage.java 44.44% 14 Missing and 1 partial ⚠️
...m/microsoft/sqlserver/jdbc/SQLServerException.java 64.28% 5 Missing ⚠️
...lserver/jdbc/PersistentTokenCacheAccessAspect.java 20.00% 3 Missing and 1 partial ⚠️
.../microsoft/sqlserver/jdbc/SQLServerConnection.java 73.33% 3 Missing and 1 partial ⚠️
...m/microsoft/sqlserver/jdbc/SQLServerStatement.java 71.42% 2 Missing and 2 partials ⚠️
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java 77.77% 1 Missing and 1 partial ⚠️
...t/sqlserver/jdbc/SQLServerConnectionPoolProxy.java 50.00% 1 Missing ⚠️
...com/microsoft/sqlserver/jdbc/SQLServerWarning.java 83.33% 1 Missing ⚠️
... and 2 more
Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #2355      +/-   ##
============================================
+ Coverage     50.00%   50.08%   +0.07%     
- Complexity     3787     3812      +25     
============================================
  Files           143      145       +2     
  Lines         33186    33309     +123     
  Branches       5631     5641      +10     
============================================
+ Hits          16596    16683      +87     
- Misses        14202    14240      +38     
+ Partials       2388     2386       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

barryw-mssql
barryw-mssql previously approved these changes Mar 20, 2024
View reviewed changes
Jeffery-Wasty
Jeffery-Wasty previously approved these changes Mar 21, 2024
View reviewed changes
@tkyc tkyc dismissed stale reviews from Jeffery-Wasty and barryw-mssql via 92f22cd March 25, 2024 16:52
@lilgreenbird lilgreenbird merged commit 7e0dcb3 into main Mar 26, 2024
17 checks passed
@lilgreenbird lilgreenbird changed the title socketTimeout should reset to original value after a successful connection open Reset socketTimeout to original value after a successful connection open Apr 3, 2024
@Jeffery-Wasty Jeffery-Wasty deleted the bounded-sockettimeout-reset branch April 3, 2024 01:10
tkyc added a commit that referenced this pull request May 23, 2024
@tkyc
socketTimeout should reset to original value after a successful conne…
328cca1 
…ction open (#2355)
@tkyc tkyc mentioned this pull request May 23, 2024
Merged
tkyc added a commit that referenced this pull request May 23, 2024
@tkyc
[Backport] SocketTimeout should be unbounded by loginTimeout after a …
17caf22 
…successful connection open (2355) (#2431)

* socketTimeout should reset to original value after a successful connection open (#2355)

* SocketTimeout should be unbounded by loginTimeout after a successful connection open
@Eng-Fouad Eng-Fouad mentioned this pull request Aug 1, 2024
Merged
@wayneguow wayneguow mentioned this pull request Aug 1, 2024
Closed
dongjoon-hyun pushed a commit to apache/spark that referenced this pull request Aug 3, 2024
@wayneguow @dongjoon-hyun
[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsS…
94b572a 
…QLServer docker image tag to `2022-CU14-ubuntu-22.04`

### What changes were proposed in this pull request?

This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`.

### Why are the changes needed?

This is the latest stable version of `mssql-jdbc`,  related release notes:

https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0

Some fixed issues:

- Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326
- Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341
- Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364
- Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355
- Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361
- Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366

### Does this PR introduce _any_ user-facing change?

No.
### How was this patch tested?

Pass GA.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #47569 from wayneguow/ms_12_8.

Authored-by: Wei Guo <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
fusheng9399 pushed a commit to fusheng9399/spark that referenced this pull request Aug 6, 2024
@wayneguow
[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsS…
884d1cc 
…QLServer docker image tag to `2022-CU14-ubuntu-22.04`

### What changes were proposed in this pull request?

This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`.

### Why are the changes needed?

This is the latest stable version of `mssql-jdbc`,  related release notes:

https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0

Some fixed issues:

- Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326
- Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341
- Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364
- Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355
- Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361
- Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366

### Does this PR introduce _any_ user-facing change?

No.
### How was this patch tested?

Pass GA.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes apache#47569 from wayneguow/ms_12_8.

Authored-by: Wei Guo <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
attilapiros pushed a commit to attilapiros/spark that referenced this pull request Oct 4, 2024
@wayneguow @attilapiros
[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsS…
335bb89 
…QLServer docker image tag to `2022-CU14-ubuntu-22.04`

### What changes were proposed in this pull request?

This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`.

### Why are the changes needed?

This is the latest stable version of `mssql-jdbc`,  related release notes:

https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0

Some fixed issues:

- Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326
- Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341
- Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364
- Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355
- Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361
- Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366

### Does this PR introduce _any_ user-facing change?

No.
### How was this patch tested?

Pass GA.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes apache#47569 from wayneguow/ms_12_8.

Authored-by: Wei Guo <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
himadripal pushed a commit to himadripal/spark that referenced this pull request Oct 19, 2024
@wayneguow
[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsS…
2a17131 
…QLServer docker image tag to `2022-CU14-ubuntu-22.04`

### What changes were proposed in this pull request?

This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`.

### Why are the changes needed?

This is the latest stable version of `mssql-jdbc`,  related release notes:

https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1
https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0

Some fixed issues:

- Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326
- Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341
- Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364
- Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355
- Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361
- Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366

### Does this PR introduce _any_ user-facing change?

No.
### How was this patch tested?

Pass GA.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes apache#47569 from wayneguow/ms_12_8.

Authored-by: Wei Guo <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barryw-mssql barryw-mssql barryw-mssql approved these changes

@Jeffery-Wasty Jeffery-Wasty Jeffery-Wasty approved these changes

@lilgreenbird lilgreenbird lilgreenbird approved these changes

Assignees
No one assigned
Labels
None yet
Projects
MSSQL JDBC
Status: Closed/Merged PRs
Milestone
12.7.0
Development

Successfully merging this pull request may close these issues.

loginTimouts overwrites socketTimeout for SELECTs
4 participants
@tkyc @lilgreenbird @Jeffery-Wasty @barryw-mssql