8291637: HttpClient default keep alive timeout not followed if server sends invalid value #9755

Michael-Mc-Mahon · 2022-08-04T20:41:33Z

Hi,

Some new keep alive tests are exposing some old bugs. In this case if the server sends an invalid timeout (say -20 seconds) we accept it creating a timeout in the past. So, the first time the keep alive thread wakes up it will close the connection.
The correct behavior is to ignore the invalid parameter and fallback to the default timeout or the timeout set by the relevant system property.

Thanks,
Michael

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8291637: HttpClient default keep alive timeout not followed if server sends invalid value

Reviewers

Jaikiran Pai (@jaikiran - Reviewer) ⚠️ Review applies to 5d028bdb
Daniel Fuchs (@dfuch - Reviewer) ⚠️ Review applies to 5d028bdb

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9755/head:pull/9755
$ git checkout pull/9755

Update a local copy of the PR:
$ git checkout pull/9755
$ git pull https://git.openjdk.org/jdk pull/9755/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9755

View PR using the GUI difftool:
$ git pr show -t 9755

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9755.diff

bridgekeeper · 2022-08-04T20:43:03Z

👋 Welcome back michaelm! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2022-08-04T20:46:28Z

@Michael-Mc-Mahon The following label will be automatically applied to this pull request:

net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2022-08-04T20:54:07Z

Webrevs

jaikiran · 2022-08-05T06:28:33Z

src/java.base/share/classes/sun/net/www/http/HttpClient.java

@@ -901,6 +901,11 @@ private boolean parseHTTPHeader(MessageHeader responses, ProgressSource pi, Http
                        /* default should be larger in case of proxy */
                        keepAliveConnections = p.findInt("max", usingProxy?50:5);


Hello Michael, should we do something similar for this max parameter value too and (re)set the keepAliveConnections to the defaults, if the server sends a negative value?

Yes, that's a good suggestion. Will do.

jaikiran · 2022-08-05T06:29:42Z

test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java

+/*
+ * @test
+ * @bug 8291637
+ * @run main/othervm -Dhttp.keepAlive.time.server=20 -esa -ea B8291637


Is it intentional that we are setting the -esa and -ea options here?

If we enable assertions without the bug fix, then an assertion is triggered in KeepAliveCache, which is useful.

tests are usually run with -esa -ea in our test systems, but individual developers could "forget" to specify those options. So in the case where it's the only thing that would make the test fail without the fix (or in the case where it would provide additional diagnostic for the particular bug fix) it can make sense to add them in the @run too...

jaikiran · 2022-08-05T06:32:01Z

test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java

+                    System.out.println("Time diff = " + diff);
+                }
+            } catch (IOException e) {
+                System.err.println("Server exception terminating");


It looks to me that if an exception occurs (not just IOException) then this test might hang (and timeout with the jtreg timeout) at the passed.get() call in the main() method. Should we perhaps catch Throwable here and do passed.completeExceptionally?

Seems reasonable.

jaikiran

Thank you for the changes, Michael. The updated version looks fine to me.

openjdk · 2022-08-05T10:57:01Z

@Michael-Mc-Mahon This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8291637: HttpClient default keep alive timeout not followed if server sends invalid value

Reviewed-by: jpai, dfuchs

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 16 new commits pushed to the master branch:

0da4314: 8288732: Reduce runtime of java.util.concurrent microbenchmarks
88c96dd: 8291947: riscv: fail to build after JDK-8290840
dd7f2d9: 8290090: Change CodeBlobType from unscoped enum to enum class
4c652d9: 8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
b0d6952: 8291823: IGV: Fix "Save selected groups"
504a626: 8291799: IGV: make "Selection mode" a toggle button
6e7cd76: 8291061: Improve thread safety of FileTime.toString and toInstant
477f471: Merge
4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
6b2184e: 8290248: Implement MaxINode::Ideal transformation
... and 6 more: https://git.openjdk.org/jdk/compare/c48cd88652e20638b1b3cc5584fd5eefedd5dbb1...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

dfuch · 2022-08-05T12:53:22Z

test/jdk/sun/net/www/http/KeepAliveCache/B8291637.java

+        public void close() {
+            try {
+                serverSocket.close();
+                s.close();


Could that trigger a NPE if s is null?

That could happen only if ServerSocket.accept throws an exception, which I guess is possible. But, the client side would not get to call Server.close then. I'll add a check anyway.

dfuch

Otherwise LGTM too

Michael-Mc-Mahon · 2022-08-05T14:34:18Z

/integrate

openjdk · 2022-08-05T14:52:21Z

Going to push as commit b17a745.
Since your change was applied there have been 16 commits pushed to the master branch:

0da4314: 8288732: Reduce runtime of java.util.concurrent microbenchmarks
88c96dd: 8291947: riscv: fail to build after JDK-8290840
dd7f2d9: 8290090: Change CodeBlobType from unscoped enum to enum class
4c652d9: 8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
b0d6952: 8291823: IGV: Fix "Save selected groups"
504a626: 8291799: IGV: make "Selection mode" a toggle button
6e7cd76: 8291061: Improve thread safety of FileTime.toString and toInstant
477f471: Merge
4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
6b2184e: 8290248: Implement MaxINode::Ideal transformation
... and 6 more: https://git.openjdk.org/jdk/compare/c48cd88652e20638b1b3cc5584fd5eefedd5dbb1...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-08-05T14:52:52Z

@Michael-Mc-Mahon Pushed as commit b17a745.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Michael-Mc-Mahon · 2022-08-05T15:01:43Z

/help

openjdk · 2022-08-05T15:03:13Z

@Michael-Mc-Mahon Available commands:

backport - create a backport
help - shows this text
tag - create a tag

fix plus test

fc08302

openjdk bot added the rfr Pull request is ready for review label Aug 4, 2022

openjdk bot added the net net-dev@openjdk.org label Aug 4, 2022

jaikiran reviewed Aug 5, 2022

View reviewed changes

update from Jai's review

5d028bd

jaikiran approved these changes Aug 5, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 5, 2022

dfuch reviewed Aug 5, 2022

View reviewed changes

dfuch approved these changes Aug 5, 2022

View reviewed changes

small test update

3579c8c

openjdk bot added the integrated Pull request has been integrated label Aug 5, 2022

openjdk bot closed this Aug 5, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 5, 2022

Michael-Mc-Mahon deleted the negKeepAlive branch August 5, 2022 15:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8291637: HttpClient default keep alive timeout not followed if server sends invalid value #9755

8291637: HttpClient default keep alive timeout not followed if server sends invalid value #9755

Michael-Mc-Mahon commented Aug 4, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Aug 4, 2022

openjdk bot commented Aug 4, 2022

mlbridge bot commented Aug 4, 2022 •

edited

Loading

jaikiran Aug 5, 2022

Michael-Mc-Mahon Aug 5, 2022

jaikiran Aug 5, 2022

Michael-Mc-Mahon Aug 5, 2022

dfuch Aug 5, 2022

jaikiran Aug 5, 2022

Michael-Mc-Mahon Aug 5, 2022

jaikiran left a comment

openjdk bot commented Aug 5, 2022 •

edited

Loading

dfuch Aug 5, 2022

Michael-Mc-Mahon Aug 5, 2022

dfuch left a comment

Michael-Mc-Mahon commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

Michael-Mc-Mahon commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

		@@ -901,6 +901,11 @@ private boolean parseHTTPHeader(MessageHeader responses, ProgressSource pi, Http
		/* default should be larger in case of proxy */
		keepAliveConnections = p.findInt("max", usingProxy?50:5);

8291637: HttpClient default keep alive timeout not followed if server sends invalid value #9755

8291637: HttpClient default keep alive timeout not followed if server sends invalid value #9755

Conversation

Michael-Mc-Mahon commented Aug 4, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Aug 4, 2022

openjdk bot commented Aug 4, 2022

mlbridge bot commented Aug 4, 2022 • edited Loading

Webrevs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jaikiran left a comment

Choose a reason for hiding this comment

openjdk bot commented Aug 5, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dfuch left a comment

Choose a reason for hiding this comment

Michael-Mc-Mahon commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

Michael-Mc-Mahon commented Aug 5, 2022

openjdk bot commented Aug 5, 2022

Michael-Mc-Mahon commented Aug 4, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 4, 2022 •

edited

Loading

openjdk bot commented Aug 5, 2022 •

edited

Loading