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

set a timeout to get the return from requesting SSL upgrade. #2572

Merged
merged 6 commits into from Jul 19, 2022
Merged

set a timeout to get the return from requesting SSL upgrade. #2572

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27ef266
set a timeout to get the return from requesting SSL upgrade.
davecramer Jul 16, 2022
27deb41
Make the SSL Response timeout a configurable property
davecramer Jul 18, 2022
574b763
fix docs and change logic to use lesser of current socket timeout or …
davecramer Jul 18, 2022
957d8a0
restore spacing
davecramer Jul 18, 2022
67c0e52
fix spacing
davecramer Jul 18, 2022
7f63448
Fix sort order by moving SSL_RESPONSE_TIMEOUT to correct location
davecramer Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java
View file
Open in desktop
Expand Up @@ -532,6 +532,9 @@ private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info,

LOGGER.log(Level.FINEST, " FE=> SSLRequest");

// set the time out to 2seconds
int currentTimeout = pgStream.getSocket().getSoTimeout();
davecramer marked this conversation as resolved.
Show resolved Hide resolved
pgStream.getSocket().setSoTimeout(2000);
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if 2sec would give us flaky timeout errors caused by gc pauses or something else.

Should we have a property to make it configurable?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wonder if 2sec would give us flaky timeout errors caused by gc pauses or something else.
One of those questions only experience will answer. Probably a little too short though

Should we have a property to make it configurable?

Probably...

// Send SSL request packet
pgStream.sendInteger4(8);
pgStream.sendInteger2(1234);
Expand All @@ -540,6 +543,8 @@ private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info,

// Now get the response from the backend, one of N, E, S.
int beresp = pgStream.receiveChar();
pgStream.getSocket().setSoTimeout(currentTimeout);

switch (beresp) {
case 'E':
LOGGER.log(Level.FINEST, " <=BE SSLError");
Expand Down